diff options
| author | Elijah Newren <newren@gmail.com> | 2019-02-14 12:25:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-14 13:23:58 -0800 |
| commit | 29d03f84a1bd0e27ab172bcd80382c5e2e8df1ec (patch) | |
| tree | 248b6181c98a6e280360494034fbcb15090233f5 /Documentation/git-rebase.txt | |
| parent | 68aa495b590d417e88562ab1e5da7d84d0531f21 (diff) | |
| download | git-29d03f84a1bd0e27ab172bcd80382c5e2e8df1ec.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 8bfa36a185..29307b1340 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -549,8 +549,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 |