Aborting cherry-pick

Hi,

I'd like to suggest improving cherry-pick messages/documentation in case of conflicts.

Example of cherry-pick conflict:

   $ git cherry-pick  c64e8caa56fd76577bbaea37592f4a9df10ab1b8
   error: could not apply c64e8ca... <<commit message>>
   hint: after resolving the conflicts, mark the corrected paths
   hint: with 'git add <paths>' or 'git rm <paths>'

   $ git status
   # On branch master
   # Unmerged paths:
   #   (use "git reset HEAD <file>..." to unstage)
   #   (use "git add/rm <file>..." as appropriate to mark resolution)
   #
   #	both modified:      <<file>>
   #
   no changes added to commit (use "git add" and/or "git commit -a")

I see following possibilities:

1. add hint to cherry-pick how to abort merge, for example:
   hint: use 'git reset --merge ORIG_HEAD' to abort merge

2. add hint to status how to abort merge, for example:
   #   (use 'git reset --merge ORIG_HEAD' to abort merge)

3. add "--abort" to cherry-pick (same option as for git-merge)

The ORIG_HEAD is specified in man page example. There is also a possibility of omitting ORIG_HEAD in which case local changes are retained. Maybe this is a better suggesting for the user? Or maybe describe both cases somewhere and point user to this documentation in status/cherry-pick output?

git-cherry-pick uses word "cancel" in man page (in example) and git-merge uses word "abort" for (as I understand) the same action.

I would suggest using either same word for both cases, or using both words in both cases. Otherwise it's confusing if you read about "aborting" merges and when you want to abort cherry-pick you don't find it - because it's called "canceling".

What is your opinion on this?