title: How to abort a cherry-pick?
body: <p>I ran <code>git cherry-pick &lt;hash&gt;</code> and had merge conflicts. I don't want to resolve the conflicts, I just want to abort the cherry-pick. When doing an actual merge (with <code>git merge</code>) there's the handy <code>git merge --abort</code>. What's the equivalent of cherry-picking?</p>