From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 Jun 2012 20:28:01 +0000 (-0700)
Subject: Merge branch 'vr/rebase-autosquash-does-not-imply-i'
X-Git-Tag: v1.7.11-rc1~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4336b53c66bf6b1de061ef38c5d281544261dc3e

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

"git rebase -p" used to pay attention to rebase.autosquash which was
wrong.  "git rebase -p -i" should, but "git rebase -p" by itself
should not.

By Vincent van Ravesteijn
* vr/rebase-autosquash-does-not-imply-i:
Do not autosquash in case of an implied interactive rebase
---

4336b53c66bf6b1de061ef38c5d281544261dc3e