From 0bddc0b10e1bb92694738c44a33bb530759c9b86 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 4 Jun 2011 21:11:00 +0200
Subject: [PATCH] rebasing-merge: make sure rebase is called with --autosquash

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 share/msysGit/rebasing-merge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/msysGit/rebasing-merge.sh b/share/msysGit/rebasing-merge.sh
index a83dbbb7..efa8af97 100755
--- a/share/msysGit/rebasing-merge.sh
+++ b/share/msysGit/rebasing-merge.sh
@@ -88,5 +88,5 @@ EOF
 	fi
 
 else
-	git rebase -i $TO
+	git rebase --autosquash -i $TO
 fi
-- 
2.11.4.GIT