diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-14 14:28:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-14 14:28:20 -0800 |
| commit | 6f07c7b91197aa06c5d8a05c67100c369012f933 (patch) | |
| tree | 7b829c0542e0862da56ec058fb9b33c88c17e5be | |
| parent | Git 2.21-rc1 (diff) | |
| parent | git-rebase.txt: update to reflect merge now implemented on sequencer (diff) | |
| download | git-6f07c7b91197aa06c5d8a05c67100c369012f933.tar.gz git-6f07c7b91197aa06c5d8a05c67100c369012f933.zip | |
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
| -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 daa16403ec..619303adbc 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -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 |