Skip to content
Snippets Groups Projects
Commit 941cab3a authored by Vincent van Ravesteijn's avatar Vincent van Ravesteijn Committed by Junio C Hamano
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: default avatarVincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent ca4effd8
Branches
Tags
No related merge requests found
......@@ -165,6 +165,7 @@ run_specific_rebase () {
if [ "$interactive_rebase" = implied ]; then
GIT_EDITOR=:
export GIT_EDITOR
autosquash=
fi
. git-rebase--$type
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment