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 <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Feb 14, 2019 at 12:25 UTC
29d03f84a1bd0e27ab172bcd80382c5e2e8df1ec
1 file changed
-2
Documentation/git-rebase.txt
-2
@@ -549,8 +549,6 @@ commit started empty (had no changes relative to its parent to
549
start with) or ended empty (all changes were already applied
550
upstream in other commits).
551
552
-The merge backend does the same.
553
-
552
The interactive backend drops commits by default that
553
started empty and halts if it hits a commit that ended up empty.
554
The `--keep-empty` option exists for the interactive backend to allow