On Sat, Apr 16, 2011 at 00:22, Jay Soffian <jaysoffian@xxxxxxxxx> wrote: >> Â-x:: >> - Â Â Â When recording the commit, append to the original commit >> - Â Â Â message a note that indicates which commit this change >> - Â Â Â was cherry-picked from. ÂAppend the note only for cherry >> + Â Â Â When recording the commit, append a line that says >> + Â Â Â "(cherry picked from commit ...)" to the original commit >> + Â Â Â message in order to indicate which commit this change was >> + Â Â Â cherry-picked from. ÂThis is done only for cherry >> Â Â Â Âpicks without conflicts. ÂDo not use this option if >> Â Â Â Âyou are cherry-picking from your private branch because >> Â Â Â Âthe information is useless to the recipient. ÂIf on the > > As long as you're nearby, "This is done only for cherryÂpicks without > conflicts." can be dropped. It's no longer true. 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. -- 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