[PATCHv2] Do not autosquash in case of an implied interactive rebase

From: Vincent van Ravesteijn <vfr@lyx.org>
Date: May 24, 2012, 13:57 UTC
Message-ID: <1337867846-5336-1-git-send-email-vfr@lyx.org>
In-Reply-To: <1337867575-7212-1-git-send-email-vfr@lyx.org>

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>
---
 git-rebase.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/git-rebase.sh b/git-rebase.sh
index 24a2840..9148ec2 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
 }

-- 
1.7.9.msysgit.0