Abort a git cherry-pick?

I ran git cherry-pick <hash> 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 git merge) there’s the handy git merge --abort. What’s the equivalent for cherry-picking?

  • Determine if directory is under git control
  • How do you create the 'master' branch on git if you forgot to create it before branching?
  • Version Git Repo for Composer Use - Git/Composer
  • How to import a git repository as a subdirectory of another git repository without losing any commit?
  • Download files from GitHub pages _site directory
  • Can I escape chars in git log output?
  • .tmux.conf: update status commands on panel focus
  • How to undo a git rebease action
  • Trouble deploying a Zend Framework site with Capistrano: SSH Authentication error
  • Should Patches have own branch in git workflow?
  • Git alias to squash all commits with a particular commit message
  • custom git command autocompletion
  • 3 Solutions collect form web for “Abort a git cherry-pick?”

    You can do the following

    git cherry-pick --abort

    From the git cherry-pick docs


    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
    Git Baby is a git and github fan, let's start git clone.