Jonathan Nieder wrote: >> Your patch is just swapping out "git reset" for "cherry-pick --abort", >> so I think that is a good improvement in the meantime. > > Um, wasn't the idea of the original message that you can run "git > reset" and then "git cherry-pick --continue"? No, and I don't know where you got that idea. Certainly not by reading the history. 37f7a85 (Teach commit about CHERRY_PICK_HEAD, 2011-02-19) introduced that string. This happened before I introduced cherry-pick --continue in 5a5d80f (revert: Introduce --continue to continue the operation, 2011-08-04). A proper solution to the problem would involve polishing sequencer.c, and probably getting --skip-empty so it behaves more like rebase. In case you missed it, one person already did that work and posted the code to the list [1]. [1]: http://article.gmane.org/gmane.comp.version-control.git/226982 -- 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