diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-13 23:50:35 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-13 23:50:35 +0900 |
| commit | b51a0fdc3822c2ef260f6d496b6df6d33b101e8a (patch) | |
| tree | 62b916b74af5ee6f51b6e924d9d7a65311085420 /diff.c | |
| parent | Merge branch 'pw/rebase-i-internal' (diff) | |
| parent | fix cherry-pick/revert status after commit (diff) | |
| download | git-b51a0fdc3822c2ef260f6d496b6df6d33b101e8a.tar.gz git-b51a0fdc3822c2ef260f6d496b6df6d33b101e8a.zip | |
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
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions