From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Tue, 20 Mar 2018 10:03:15 +0000 (+0000)
Subject: rebase: respect --no-keep-empty
X-Git-Tag: v2.18.0-rc0~131^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d946165e1177905103a25aeb374e018c510e540;p=thirdparty%2Fgit.git

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>
---

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