From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Apr 2018 04:28:49 +0000 (+0900)
Subject: Merge branch 'pw/rebase-keep-empty-fixes'
X-Git-Tag: v2.18.0-rc0~131
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d892beef52a293b271538481dbc76014672ddf09;p=git

Merge branch 'pw/rebase-keep-empty-fixes'

"git rebase --keep-empty" still removed an empty commit if the
other side contained an empty commit (due to the "does an
equivalent patch exist already?" check), which has been corrected.

* pw/rebase-keep-empty-fixes:
  rebase: respect --no-keep-empty
  rebase -i --keep-empty: don't prune empty commits
  rebase --root: stop assuming squash_onto is unset
---

d892beef52a293b271538481dbc76014672ddf09
diff --cc git-rebase.sh
index fb64ee1fe4,37b8f13971..548c15e4a1
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@@ -267,9 -263,9 +268,12 @@@ d
  	--keep-empty)
  		keep_empty=yes
  		;;
 +	--allow-empty-message)
 +		allow_empty_message=--allow-empty-message
 +		;;
+ 	--no-keep-empty)
+ 		keep_empty=
+ 		;;
  	--preserve-merges)
  		preserve_merges=t
  		test -z "$interactive_rebase" && interactive_rebase=implied