]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dd/rebase-merge-reserves-onto-label'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:43 +0000 (12:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:43 +0000 (12:52 -0800)
The logic to avoid duplicate label names generated by "git rebase
--rebase-merges" forgot that the machinery itself uses "onto" as a
label name, which must be avoided by auto-generated labels, which
has been corrected.

* dd/rebase-merge-reserves-onto-label:
  sequencer: handle rebase-merges for "onto" message

1  2 
sequencer.c
t/t3430-rebase-merges.sh

diff --cc sequencer.c
Simple merge
Simple merge