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
8a6dae108eadbd2882296981e03fd8e251d42f56
1 file changed
+1
git-rebase.sh
+1
@@ -167,6 +167,7 @@ run_specific_rebase () {
167
if [ "$interactive_rebase" = implied ]; then
168
GIT_EDITOR=:
169
export GIT_EDITOR
170
+ autosquash=
171
fi
172
. git-rebase--$type
173
}