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.10.5~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=941cab3a78a3fd3d21ba3acb3f8da3407a692015;p=thirdparty%2Fgit.git

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

diff --git a/git-rebase.sh b/git-rebase.sh
index 03f73da887..ede9723327 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -165,6 +165,7 @@ run_specific_rebase () {
 	if [ "$interactive_rebase" = implied ]; then
 		GIT_EDITOR=:
 		export GIT_EDITOR
+		autosquash=
 	fi
 	. git-rebase--$type
 }