From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Thu, 24 May 2012 13:57:26 +0000 (+0000)
Subject: Do not autosquash in case of an implied interactive rebase
X-Git-Tag: v1.7.11-rc1~5^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8a6dae108eadbd2882296981e03fd8e251d42f56?ds=inline;hp=-c

Do not autosquash in case of an implied interactive rebase

The option to autosquash is only used in case of an interactive rebase.
When merges are preserved, rebase uses an interactive rebase internally,
but in this case autosquash should still be disabled.

Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

8a6dae108eadbd2882296981e03fd8e251d42f56
diff --git a/git-rebase.sh b/git-rebase.sh
index 24a2840033..9148ec25c1 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -167,6 +167,7 @@ run_specific_rebase () {
 	if [ "$interactive_rebase" = implied ]; then
 		GIT_EDITOR=:
 		export GIT_EDITOR
+		autosquash=
 	fi
 	. git-rebase--$type
 }