On Sat, Apr 16, 2011 at 18:33, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> 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. Thanks for explaining. I keep my patchv2 as-is in this case. -- Sebastian Schuberth -- 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