summaryrefslogtreecommitdiff
path: root/contrib/hooks
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-12-05 12:52:43 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-12-05 12:52:43 -0800
commit995b1b1411e5ad45d100354f4a6c185fef79cbf6 (patch)
tree4a4305faaa93c1fca895a18380d61f532850f557 /contrib/hooks
parentMerge branch 'js/builtin-add-i' (diff)
parentsequencer: handle rebase-merges for "onto" message (diff)
downloadtgif-995b1b1411e5ad45d100354f4a6c185fef79cbf6.tar.xz
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 'contrib/hooks')
0 files changed, 0 insertions, 0 deletions