{"thread":{"id":"12838","subject":"[PATCH] git-cherry-pick -x works with conflicting commits","startedAt":"2008-03-24T10:41:14Z","lastAt":"2008-03-24T18:32:39Z","messageCount":4,"participants":["Rafael Garcia-Suarez","Jean-Baptiste Quenot"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"72869","messageId":"1206355274-6052-1-git-send-email-rgarciasuarez@gmail.com","threadId":"12838","inReplyTo":null,"subject":"[PATCH] git-cherry-pick -x works with conflicting commits","fromName":"Rafael Garcia-Suarez","fromEmail":"rgarciasuarez@gmail.com","sentAt":"2008-03-24T10:41:14Z","receivedAt":"2008-03-24T10:41:14Z","isPatch":true,"sender":{"key":"rgarciasuarez@gmail.com","avatar":null},"body":"So this patch fixes the docs to reflect that.\n\nSigned-off-by: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>\n---\n Documentation/git-cherry-pick.txt |    3 +--\n 1 files changed, 1 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt\nindex f0beb41..475e168 100644\n--- a/Documentation/git-cherry-pick.txt\n+++ b/Documentation/git-cherry-pick.txt\n@@ -29,8 +29,7 @@ OPTIONS\n -x::\n \tWhen recording the commit, append to the original commit\n \tmessage a note that indicates which commit this change\n-\twas cherry-picked from.  Append the note only for cherry\n-\tpicks without conflicts.  Do not use this option if\n+\twas cherry-picked from.  Do not use this option if\n \tyou are cherry-picking from your private branch because\n \tthe information is useless to the recipient.  If on the\n \tother hand you are cherry-picking between two publicly\n-- \n1.5.5.rc1\n"},{"id":"72889","messageId":"ae63f8b50803240655k5d6413e5s8d6ceebca462370f@mail.gmail.com","threadId":"12838","inReplyTo":"1206355274-6052-1-git-send-email-rgarciasuarez@gmail.com","subject":"Re: [PATCH] git-cherry-pick -x works with conflicting commits","fromName":"Jean-Baptiste Quenot","fromEmail":"jbq@caraldi.com","sentAt":"2008-03-24T13:55:28Z","receivedAt":"2008-03-24T13:55:28Z","isPatch":true,"sender":{"key":"jbq@caraldi.com","avatar":null},"body":"When I'm using \"git commit -c <id>\" as suggested by git-cherry-pick\nupon conflict, I do not get the mention \"(cherry picked from commit\n<id>)\", at least with version 1.5.4.1.  How did you get it?\n\nCheers,\n-- \nJean-Baptiste Quenot\nhttp://caraldi.com/jbq/blog/\n"},{"id":"72898","messageId":"b77c1dce0803240752s29e611aay55c4021741de598a@mail.gmail.com","threadId":"12838","inReplyTo":"ae63f8b50803240655k5d6413e5s8d6ceebca462370f@mail.gmail.com","subject":"Re: [PATCH] git-cherry-pick -x works with conflicting commits","fromName":"Rafael Garcia-Suarez","fromEmail":"rgarciasuarez@gmail.com","sentAt":"2008-03-24T14:52:57Z","receivedAt":"2008-03-24T14:52:57Z","isPatch":true,"sender":{"key":"rgarciasuarez@gmail.com","avatar":null},"body":"On 24/03/2008, Jean-Baptiste Quenot <jbq@caraldi.com> wrote:\n> When I'm using \"git commit -c <id>\" as suggested by git-cherry-pick\n>  upon conflict, I do not get the mention \"(cherry picked from commit\n>  <id>)\", at least with version 1.5.4.1.  How did you get it?\n\nI use the most recent git from master, and simply do git-add and\ngit-commit without arguments after having resolving the conflict. The\ncommit message in MERGE_MSG, that I checked, does have the \"cherry\npicked from commit <id>\" mention (before the conflict list).\n"},{"id":"72926","messageId":"ae63f8b50803241132s2938ae17s79257fdb7938ba79@mail.gmail.com","threadId":"12838","inReplyTo":"b77c1dce0803240752s29e611aay55c4021741de598a@mail.gmail.com","subject":"Re: [PATCH] git-cherry-pick -x works with conflicting commits","fromName":"Jean-Baptiste Quenot","fromEmail":"jbq@caraldi.com","sentAt":"2008-03-24T18:32:39Z","receivedAt":"2008-03-24T18:32:39Z","isPatch":true,"sender":{"key":"jbq@caraldi.com","avatar":null},"body":"All right, I see.  The conflict error message was confusing me:\n\n------------------------------------------------------------------------\nfatal: Entry 'azerty' would be overwritten by merge. Cannot merge.\nAutomatic cherry-pick failed.  After resolving the conflicts,\nmark the corrected paths with 'git add <paths>' or 'git rm <paths>'\nand commit the result.\nWhen commiting, use the option '-c c17532f' to retain authorship and message.\n------------------------------------------------------------------------\n\nThe last sentence does not make much sense when -x is specified.\n\nCheers,\n-- \nJean-Baptiste Quenot\nhttp://caraldi.com/jbq/blog/\n"}]}