tree 62b916b74af5ee6f51b6e924d9d7a65311085420
parent 7ba06bc3d026cee54437db5cfddfffe7b4d7a187
parent 4a72486de97b5c6b0979b2b51e50c268bdb0d4f6
author Junio C Hamano <gitster@pobox.com> 1557759035 +0900
committer Junio C Hamano <gitster@pobox.com> 1557759035 +0900

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