diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:49 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:49 +0900 |
| commit | d892beef52a293b271538481dbc76014672ddf09 (patch) | |
| tree | e9f7896908c60aff2a25a6fe4ac327aaaa6d6974 /git-rebase.sh | |
| parent | 18a6a8571fa150441de06e007e9c61856bfadc5d (diff) | |
| parent | 3d946165e1177905103a25aeb374e018c510e540 (diff) | |
| download | git-d892beef52a293b271538481dbc76014672ddf09.tar.gz | |
Merge branch 'pw/rebase-keep-empty-fixes'
"git rebase --keep-empty" still removed an empty commit if the
other side contained an empty commit (due to the "does an
equivalent patch exist already?" check), which has been corrected.
* pw/rebase-keep-empty-fixes:
rebase: respect --no-keep-empty
rebase -i --keep-empty: don't prune empty commits
rebase --root: stop assuming squash_onto is unset
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index fb64ee1fe4..548c15e4a1 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -62,6 +62,7 @@ $(gettext 'Resolve all conflicts manually, mark them as resolved with You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort".') " +squash_onto= unset onto unset restrict_revision cmd= @@ -270,6 +271,9 @@ do --allow-empty-message) allow_empty_message=--allow-empty-message ;; + --no-keep-empty) + keep_empty= + ;; --preserve-merges) preserve_merges=t test -z "$interactive_rebase" && interactive_rebase=implied |