Junio C Hamano b51a0fdc38 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

2019-05-13 23:50:35 +09:00

50 KiB

Raw Blame History

View Raw