From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Feb 2019 22:28:20 +0000 (-0800)
Subject: Merge branch 'en/rebase-merge-on-sequencer'
X-Git-Tag: v2.21.0-rc2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f07c7b91197aa06c5d8a05c67100c369012f933;p=thirdparty%2Fgit.git

Merge branch 'en/rebase-merge-on-sequencer'

"git rebase --merge" as been reimplemented by reusing the internal
machinery used for "git rebase -i".

* en/rebase-merge-on-sequencer:
  git-rebase.txt: update to reflect merge now implemented on sequencer
---

6f07c7b91197aa06c5d8a05c67100c369012f933