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, -- Jean-Baptiste Quenot http://caraldi.com/jbq/blog/ -- 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