Browse Source

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>
maint
Vincent van Ravesteijn 13 years ago committed by Junio C Hamano
parent
commit
8a6dae108e
  1. 1
      git-rebase.sh

1
git-rebase.sh

@ -167,6 +167,7 @@ run_specific_rebase () { @@ -167,6 +167,7 @@ run_specific_rebase () {
if [ "$interactive_rebase" = implied ]; then
GIT_EDITOR=:
export GIT_EDITOR
autosquash=
fi
. git-rebase--$type
}

Loading…
Cancel
Save