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>
Phillip Wood committed
Mar 20, 2018 at 10:03 UTC
3d946165e1177905103a25aeb374e018c510e540
1 file changed
+3
git-rebase.sh
+3
@@ -263,6 +263,9 @@ do
263
--keep-empty)
264
keep_empty=yes
265
;;
266
+ --no-keep-empty)
267
+ keep_empty=
268
+ ;;
269
--preserve-merges)
270
preserve_merges=t
271
test -z "$interactive_rebase" && interactive_rebase=implied