Merge branch 'vr/rebase-autosquash-does-not-imply-i' into next

Will merge to master by 1.7.11 final.

By Vincent van Ravesteijn
* vr/rebase-autosquash-does-not-imply-i:
  Do not autosquash in case of an implied interactive rebase
This commit is contained in:
Junio C Hamano
2012-05-30 13:36:38 -07:00

View File

@@ -167,6 +167,7 @@ run_specific_rebase () {
if [ "$interactive_rebase" = implied ]; then
GIT_EDITOR=:
export GIT_EDITOR
autosquash=
fi
. git-rebase--$type
}