]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f7998d9 e02058a)
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)
commit995b1b1411e5ad45d100354f4a6c185fef79cbf6
tree4a4305faaa93c1fca895a18380d61f532850f557tree | snapshot
parentf7998d979322c439578a4334524ae2c924042705commit | diff
parente02058a72967b18bd906674de6191f42d03b0763commit | diff
Merge branch 'dd/rebase-merge-reserves-onto-label'

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
sequencer.c diff1 | diff2 | blob | history
t/t3430-rebase-merges.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.