Skip to content

Commit 6f07c7b

Browse files
committed
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
2 parents 8989e19 + 29d03f8 commit 6f07c7b

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
@@ -554,8 +554,6 @@ commit started empty (had no changes relative to its parent to
554554
start with) or ended empty (all changes were already applied
555555
upstream in other commits).
556556

557-
The merge backend does the same.
558-
559557
The interactive backend drops commits by default that
560558
started empty and halts if it hits a commit that ended up empty.
561559
The `--keep-empty` option exists for the interactive backend to allow

0 commit comments

Comments
 (0)