Sebastian Schuberth <sschuberth@xxxxxxxxx> writes: > How can this be not true anymore? If you get a conflict while picking, > you're asked to resolve the conflict and then commit via "git commit > -c <picked_sha1>". Doing so will *not* give you the mentioned "(cherry > picked from commit ...)" line. I suspect Jay had the recent CHERRY_PICK_HEAD series that lets you omit saying "-c <picked>" in mind. We should not leave the cherry-picked from in such a case, I think, but the new code may be buggy. -- 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