mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
befc5ed379
commit
8a6dae108e
|
@ -167,6 +167,7 @@ run_specific_rebase () {
|
|||
if [ "$interactive_rebase" = implied ]; then
|
||||
GIT_EDITOR=:
|
||||
export GIT_EDITOR
|
||||
autosquash=
|
||||
fi
|
||||
. git-rebase--$type
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue