On 24/03/2008, Jean-Baptiste Quenot <jbq@xxxxxxxxxxx> wrote: > 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? 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). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
