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)
commit6f07c7b91197aa06c5d8a05c67100c369012f933
tree7b829c0542e0862da56ec058fb9b33c88c17e5be
parent8989e1950a845ceeb186d490321a4f917ca4de47
parent29d03f84a1bd0e27ab172bcd80382c5e2e8df1ec
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
Documentation/git-rebase.txt