tree 7b829c0542e0862da56ec058fb9b33c88c17e5be
parent 8989e1950a845ceeb186d490321a4f917ca4de47
parent 29d03f84a1bd0e27ab172bcd80382c5e2e8df1ec
author Junio C Hamano <gitster@pobox.com> 1550183300 -0800
committer Junio C Hamano <gitster@pobox.com> 1550183300 -0800

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