Skip to content

Commit 941cab3

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 ca4effd commit 941cab3

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
@@ -165,6 +165,7 @@ run_specific_rebase () {
165165
if [ "$interactive_rebase" = implied ]; then
166166
GIT_EDITOR=:
167167
export GIT_EDITOR
168+
autosquash=
168169
fi
169170
. git-rebase--$type
170171
}

0 commit comments

Comments
 (0)