From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 13:57:42 +0000 (+0900)
Subject: Merge branch 'js/rebase-i-autosquash-fix' into maint
X-Git-Tag: v2.19.2~64
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ff92463b3cdd99c59ec6fe26271617863d4d4b0c

Merge branch 'js/rebase-i-autosquash-fix' into maint

"git rebase -i" did not clear the state files correctly when a run
of "squash/fixup" is aborted and then the user manually amended the
commit instead, which has been corrected.

* js/rebase-i-autosquash-fix:
rebase -i: be careful to wrap up fixup/squash chains
rebase -i --autosquash: demonstrate a problem skipping the last squash
---

ff92463b3cdd99c59ec6fe26271617863d4d4b0c