Skip to content

Commit

Permalink
Do not autosquash in case of an implied interactive rebase
Browse files Browse the repository at this point in the history
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
vfr-nl authored and gitster committed Jun 17, 2012
1 parent ca4effd commit 941cab3
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions git-rebase.sh
Expand Up @@ -165,6 +165,7 @@ run_specific_rebase () {
if [ "$interactive_rebase" = implied ]; then
GIT_EDITOR=:
export GIT_EDITOR
autosquash=
fi
. git-rebase--$type
}
Expand Down

0 comments on commit 941cab3

Please sign in to comment.