Ramkumar Ramachandra wrote: > [Subject: reset: Make reset remove the sequencer state] The chosen strategy here also affects some other commands, most notably "git checkout". [...] > Guard against accidental removal of the sequencer state by providing > one level of "undo". In the first "reset" invocation, > ".git/sequencer" is moved to ".git/sequencer-old"; it is completely > removed only in the second invocation. That doesn't help much if the user doesn't know about it, I fear. Any ideas about how to address that? Especially, if I run git checkout HEAD^ and get the response note: removing pending cherry-pick state hint: use "git cherry-pick --revive" to return to the cherry-pick then I probably would not be too annoyed. And on the other hand, if I run git reset --hard to clear away an ugly conflict in the course of a long cherry-pick-many and suddenly "git cherry-pick --continue" stops working without explanation and the only way I know to finish the job I was working on is to start over, that would be an unpleasant experience. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html