summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-05 20:52:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-05 20:52:43 (GMT)
commit995b1b1411e5ad45d100354f4a6c185fef79cbf6 (patch)
tree4a4305faaa93c1fca895a18380d61f532850f557 /userdiff.c
parentf7998d979322c439578a4334524ae2c924042705 (diff)
parente02058a72967b18bd906674de6191f42d03b0763 (diff)
downloadgit-995b1b1411e5ad45d100354f4a6c185fef79cbf6.zip
git-995b1b1411e5ad45d100354f4a6c185fef79cbf6.tar.gz
git-995b1b1411e5ad45d100354f4a6c185fef79cbf6.tar.bz2
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
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions