rebase: respect --no-keep-empty
$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>
This commit is contained in:
parent
76ea235891
commit
3d946165e1
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user