On a local repo, I've just executed `git cherry-pick SHA` without any conflicts or problems. I then realized I didn't want to do what I just did. I have not pushed this anywhere.

How can I remove just this cherry pick?

I'd like to know if there's a way to do this:

* when I have other local changes
* when I have no other local changes

Preferably with one command for both cases if possible.