Hi, On Wed, Dec 7, 2016 at 7:36 PM, Stephan Beyer <s-beyer@xxxxxxx> wrote: > Hi, > > On 12/06/2016 07:58 PM, Junio C Hamano wrote: > >> (1) The third invocation of "cherry-pick" with "--abort" to get rid >> of the state from the unfinished cherry-pick we did previously >> is necessary, but the command does not notice that we resetted >> to a new branch AND we even did some other work there. This >> loses end-user's work. >> >> "git cherry-pick --abort" should learn from "git am --abort" >> that has an extra safety to deal with the above workflow. The >> state from the unfinished "am" is removed, but the head is not >> rewound to avoid losing end-user's work. >> >> You can try by replacing two instances of >> >> $ git cherry-pick 0582a34f52..a94bb68397 >> >> with >> >> $ git format-patch --stdout 0582a34f52..a94bb68397 | git am >> >> in the above sequence, and conclude with "git am--abort" to see >> how much more pleasant and safe "git am --abort" is. > Definitely. I'd volunteer to add that safety guard. (But (2) remains.) That would be great if you could take care of that! Thanks, Christian.