git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 68aa495)
git-rebase.txt: update to reflect merge now implemented on sequencer
authorElijah Newren <redacted>
Thu, 14 Feb 2019 20:25:41 +0000 (12:25 -0800)
committerJunio C Hamano <redacted>
Thu, 14 Feb 2019 21:23:58 +0000 (13:23 -0800)
commit29d03f84a1bd0e27ab172bcd80382c5e2e8df1ec
tree248b6181c98a6e280360494034fbcb15090233f5tree | snapshot
parent68aa495b590d417e88562ab1e5da7d84d0531f21commit | diff
git-rebase.txt: update to reflect merge now implemented on sequencer

Since commit 8fe9c3f21dff (Merge branch 'en/rebase-merge-on-sequencer',
2019-02-06), --merge now uses the interactive backend (and matches its
behavior) so there is no separate merge backend anymore.  Fix an
oversight in the docs that should have been updated with the previous
change.

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/git-rebase.txt diff | blob | history
git clone https://git.99rst.org/PROJECT