Skip to contentSkip to conversation

git-rebase.txt: update to reflect merge now implemented on sequencer

PATCH In review Elijah Newren 2 participants 2 messages Feb 14, 2019 – Feb 18, 2019 Documentation

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 Documentation/git-rebase.txt | 2 --
 1 file changed, 2 deletions(-)
Documentation/git-rebase.txt +0 -2
index daa16403ec..619303adbc 100644
@@ -554,8 +554,6 @@ commit started empty (had no changes relative to its parent to
 start with) or ended empty (all changes were already applied
 upstream in other commits).
 
-The merge backend does the same.
-
 The interactive backend drops commits by default that
 started empty and halts if it hits a commit that ended up empty.
 The `--keep-empty` option exists for the interactive backend to allow
Signature · 1 line
2.21.0.rc0.269.g1a574e7a28
#1 lore raw

Hi Elijah,

Quoted 7 lines · Elijah Newren

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.

ACK,
Dscho

Quoted 21 lines
---
 Documentation/git-rebase.txt | 2 --
 1 file changed, 2 deletions(-)
Documentation/git-rebase.txt +0 -2
index daa16403ec..619303adbc 100644
@@ -554,8 +554,6 @@ commit started empty (had no changes relative to its parent to
 start with) or ended empty (all changes were already applied
 upstream in other commits).
 
-The merge backend does the same.
-
 The interactive backend drops commits by default that
 started empty and halts if it hits a commit that ended up empty.
 The `--keep-empty` option exists for the interactive backend to allow
Signature · 1 line
2.21.0.rc0.269.g1a574e7a28