rebase: respect --no-keep-empty
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Tue, 20 Mar 2018 10:03:15 +0000 (10:03 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Mar 2018 17:46:48 +0000 (10:46 -0700)
$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>
git-rebase.sh
index 8b1b892d72853b4256dd864637ccf44376350dff..37b8f13971d424f9bf4b45b5f539f036388fcb30 100755 (executable)
@@ -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