Hi, Daniel Barkalow wrote: > But it's annoying that, in order > to finish a conflicted "git cherry-pick <branch>", you currently need to > go back and find the instruction that says to commit it yourself, with the > option "-c <sha1>" to retain authorship and message. You might like v1.7.5-rc0~88^2 (Teach commit about CHERRY_PICK_HEAD, 2011-02-19). > And if you want to > abort it, you need to remember "git reset --hard HEAD" (and maybe you also > want "git rerere clear"). Hm, I had assumed reset --hard (or "git reset --merge HEAD") would take care of the "rerere clear" but it seems that indeed it doesn't. -- 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