Merge branch 'en/rebase-merge-on-sequencer'
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 22:28:20 +0000 (14:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 22:28:20 +0000 (14:28 -0800)
"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

1  2 
Documentation/git-rebase.txt
Simple merge