patchgit-cherry-pick -x works with conflicting commits

So this patch fixes the docs to reflect that.

Signed-off-by: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
---
 Documentation/git-cherry-pick.txt |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

When I'm using "git commit -c <id>" as suggested by git-cherry-pick upon conflict, I do not get the mention "(cherry picked from commit <id>)", at least with version 1.5.4.1. How did you get it?

Cheers,

On 24/03/2008, Jean-Baptiste Quenot <jbq@caraldi.com> wrote:

I use the most recent git from master, and simply do git-add and git-commit without arguments after having resolving the conflict. The commit message in MERGE_MSG, that I checked, does have the "cherry picked from commit <id>" mention (before the conflict list).

All right, I see.  The conflict error message was confusing me:

------------------------------------------------------------------------ fatal: Entry 'azerty' would be overwritten by merge. Cannot merge. Automatic cherry-pick failed. After resolving the conflicts, mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result. When commiting, use the option '-c c17532f' to retain authorship and message. ------------------------------------------------------------------------

The last sentence does not make much sense when -x is specified.

Cheers,