Skip to content

Commit 8a6dae1

Browse files
vfr-nlgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent befc5ed commit 8a6dae1

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

git-rebase.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ run_specific_rebase () {
167167
if [ "$interactive_rebase" = implied ]; then
168168
GIT_EDITOR=:
169169
export GIT_EDITOR
170+
autosquash=
170171
fi
171172
. git-rebase--$type
172173
}

0 commit comments

Comments
 (0)