Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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>
  • Loading branch information...
commit 941cab3a78a3fd3d21ba3acb3f8da3407a692015 1 parent ca4effd
Vincent van Ravesteijn vfr-nl authored gitster committed

Showing 1 changed file with 1 addition and 0 deletions. Show diff stats Hide diff stats

  1. +1 0  git-rebase.sh
1  git-rebase.sh
@@ -165,6 +165,7 @@ run_specific_rebase () {
165 165 if [ "$interactive_rebase" = implied ]; then
166 166 GIT_EDITOR=:
167 167 export GIT_EDITOR
  168 + autosquash=
168 169 fi
169 170 . git-rebase--$type
170 171 }

0 comments on commit 941cab3

Please sign in to comment.
Something went wrong with that request. Please try again.