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>
Vincent van Ravesteijn committed
May 24, 2012 at 13:57 UTC
941cab3a78a3fd3d21ba3acb3f8da3407a692015
1 file changed
+1
git-rebase.sh
+1
@@ -165,6 +165,7 @@ run_specific_rebase () {
165
if [ "$interactive_rebase" = implied ]; then
166
GIT_EDITOR=:
167
export GIT_EDITOR
168
+ autosquash=
169
fi
170
. git-rebase--$type
171
}