From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Dec 2019 20:52:43 +0000 (-0800)
Subject: Merge branch 'dd/rebase-merge-reserves-onto-label'
X-Git-Tag: v2.25.0-rc0~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=995b1b1411e5ad45d100354f4a6c185fef79cbf6;p=thirdparty%2Fgit.git

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
---

995b1b1411e5ad45d100354f4a6c185fef79cbf6