Abort a git cherry-pick?

You can do the following

git cherry-pick --abort

From the git cherry-pick docs

--abort  
Cancel the operation and return to the pre-sequence state.

I found the answer is git reset --merge - it clears the conflicted cherry-pick attempt.

For me, the only way to reset the failed cherry-pick-attempt was

git reset --hard HEAD

Related