From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 May 2019 14:50:35 +0000 (+0900)
Subject: Merge branch 'pw/clean-sequencer-state-upon-final-commit'
X-Git-Tag: v2.22.0-rc0~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b51a0fdc3822c2ef260f6d496b6df6d33b101e8a?hp=b51a0fdc3822c2ef260f6d496b6df6d33b101e8a

Merge branch 'pw/clean-sequencer-state-upon-final-commit'

"git chery-pick" (and "revert" that shares the same runtime engine)
that deals with multiple commits got confused when the final step
gets stopped with a conflict and the user concluded the sequence
with "git commit".  Attempt to fix it by cleaning up the state
files used by these commands in such a situation.

* pw/clean-sequencer-state-upon-final-commit:
fix cherry-pick/revert status after commit
commit/reset: try to clean up sequencer state
---