Re: Proper way to abort incorrect cherry-picking?

On Thu, Apr 29, 2010 at 9:37 AM, Jonathan Nieder [off-list ref] wrote:

Hi Jon,

Jon Seymour wrote:

quoted

If you use git reset --mixed HEAD@{1} you can reset the index to
HEAD@{1} to reflect the pre-merge state.

The HEAD doesn’t advance in a failed merge, right?

True, but I understood this issue to be that there were two cherry
picks, one of which worked, one of which failed because it was out of
order. Hence git reset HEAD@{1} would reset prior to the first
successful (but out of order) cherry-pick.

Any way, thanks for the explaining the virtue of git reset --merge.

jon.