On Fri, Jul 26, 2013 at 02:37:05PM -0700, Jonathan Nieder wrote: > Jeff King 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"?
Maybe. :) I missed that subtlety. Of my "three things you would want to do", that means it was _trying_ say number 2, how to skip, rather than 3, how to abort. If that is the case, then it should probably explain the sequence of steps as "reset and then --continue" to make it more clear. I.e., a patch is needed, but Ram's is going in the opposite direction. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
