Skip to content

Commit 29d03f8

Browse files
newrengitster
authored andcommitted
git-rebase.txt: update to reflect merge now implemented on sequencer
Since commit 8fe9c3f (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 68aa495 commit 29d03f8

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

Documentation/git-rebase.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,6 @@ commit started empty (had no changes relative to its parent to
549549
start with) or ended empty (all changes were already applied
550550
upstream in other commits).
551551

552-
The merge backend does the same.
553-
554552
The interactive backend drops commits by default that
555553
started empty and halts if it hits a commit that ended up empty.
556554
The `--keep-empty` option exists for the interactive backend to allow

0 commit comments

Comments
 (0)