Permalink
Browse files

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>
  • Loading branch information...
1 parent ca4effd commit 941cab3a78a3fd3d21ba3acb3f8da3407a692015 @vfr-nl vfr-nl committed with gitster May 24, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 git-rebase.sh
View
1 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
}

0 comments on commit 941cab3

Please sign in to comment.