diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-19 15:26:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-19 15:26:45 -0800 |
| commit | d3be992a031c05fe1064c94e11d7c53a32fd8c82 (patch) | |
| tree | 3d2f10a8cad60cc72ed9217b33596d2141d156f8 /git-rebase.txt | |
| parent | 2f80fe95f22fdd82c0f720180001baab74199534 (diff) | |
| download | git-htmldocs-d3be992a031c05fe1064c94e11d7c53a32fd8c82.tar.gz | |
Autogenerated HTML docs for v2.21.0-rc2
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index daa16403e..5629ba4c5 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -529,7 +529,6 @@ are incompatible with the following options: * --interactive * --exec * --keep-empty - * --autosquash * --edit-todo * --root when used in combination with --onto @@ -554,8 +553,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 |