diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2018-03-20 10:03:15 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-29 10:46:48 -0700 |
| commit | 3d946165e1177905103a25aeb374e018c510e540 (patch) | |
| tree | 368b8456b683836a1f83f080e0d74dfb9e7f9d23 | |
| parent | 76ea235891c08e43226391cceaca8be056a1f803 (diff) | |
| download | git-pw/rebase-keep-empty-fixes.tar.gz | |
rebase: respect --no-keep-emptypw/rebase-keep-empty-fixes
$OPT_SPEC has always allowed --no-keep-empty so lets start handling
it.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-rebase.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 8b1b892d72..37b8f13971 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -263,6 +263,9 @@ do --keep-empty) keep_empty=yes ;; + --no-keep-empty) + keep_empty= + ;; --preserve-merges) preserve_merges=t test -z "$interactive_rebase" && interactive_rebase=implied |