From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Sep 2018 17:30:45 +0000 (-0700)
Subject: Merge branch 'js/rebase-i-autosquash-fix'
X-Git-Tag: v2.20.0-rc0~224
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/87ae8a1a950da28a2f75570ecaecbc9cd439c64c?hp=87ae8a1a950da28a2f75570ecaecbc9cd439c64c

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

"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
---