{"thread":{"id":"24217","subject":"git log and cherry-picks","startedAt":"2010-06-28T16:02:57Z","lastAt":"2010-07-05T05:39:20Z","messageCount":4,"participants":["Erez Zilber","Michael J Gruber","Antriksh Pany"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"144390","messageId":"AANLkTil6-rd5y9xcTVz4kJ4O2jL9ZdXYo1JrgYA3sM6N@mail.gmail.com","threadId":"24217","inReplyTo":null,"subject":"git log and cherry-picks","fromName":"Erez Zilber","fromEmail":"erezzi.list@gmail.com","sentAt":"2010-06-28T16:02:57Z","receivedAt":"2010-06-28T16:02:57Z","isPatch":false,"sender":{"key":"erezzi.list@gmail.com","avatar":null},"body":"Hi,\n\nI saw that I can run git log with '--cherry-pick'. With this, if I run\n\"git log --cherry-pick branch_a..branch_b\", it doesn't show\ndifferences that are caused by cherry picks.\n\nMy question is: sometimes, cherry picking from branch_a to branch_b is\nnot immediate, and I need to adapt the patch that was committed on\nbranch_a to apply on branch_b. In other cases, git is able to apply\nthe patch on branch_b automatically (e.g. if there's only a line\noffset). In such cases, will \"git log --cherry-pick\" ignore these\ncherry-picks like it ignores cherry-picks that were applied without\nany problem?\n\nThanks,\nErez\n"},{"id":"144409","messageId":"4C28F300.1060506@drmicha.warpmail.net","threadId":"24217","inReplyTo":"AANLkTil6-rd5y9xcTVz4kJ4O2jL9ZdXYo1JrgYA3sM6N@mail.gmail.com","subject":"Re: git log and cherry-picks","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-06-28T19:07:44Z","receivedAt":"2010-06-28T19:07:44Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Erez Zilber venit, vidit, dixit 28.06.2010 18:02:\n> Hi,\n> \n> I saw that I can run git log with '--cherry-pick'. With this, if I run\n> \"git log --cherry-pick branch_a..branch_b\", it doesn't show\n> differences that are caused by cherry picks.\n> \n> My question is: sometimes, cherry picking from branch_a to branch_b is\n> not immediate, and I need to adapt the patch that was committed on\n> branch_a to apply on branch_b. In other cases, git is able to apply\n> the patch on branch_b automatically (e.g. if there's only a line\n> offset). In such cases, will \"git log --cherry-pick\" ignore these\n> cherry-picks like it ignores cherry-picks that were applied without\n> any problem?\n\nWith --cherry-pick, log omits those commits whose associated patch has\nthe same patch-id (see \"git patch-id\").\n\nMichael\n"},{"id":"144413","messageId":"AANLkTinSFdB28QpfcqAuVCFzho0P_H_MG6_i2ODKiWuD@mail.gmail.com","threadId":"24217","inReplyTo":"4C28F300.1060506@drmicha.warpmail.net","subject":"Re: git log and cherry-picks","fromName":"Erez Zilber","fromEmail":"erezzi.list@gmail.com","sentAt":"2010-06-28T20:25:07Z","receivedAt":"2010-06-28T20:25:07Z","isPatch":false,"sender":{"key":"erezzi.list@gmail.com","avatar":null},"body":"On Mon, Jun 28, 2010 at 10:07 PM, Michael J Gruber\n wrote:\n> Erez Zilber venit, vidit, dixit 28.06.2010 18:02:\n>> Hi,\n>>\n>> I saw that I can run git log with '--cherry-pick'. With this, if I run\n>> \"git log --cherry-pick branch_a..branch_b\", it doesn't show\n>> differences that are caused by cherry picks.\n>>\n>> My question is: sometimes, cherry picking from branch_a to branch_b is\n>> not immediate, and I need to adapt the patch that was committed on\n>> branch_a to apply on branch_b. In other cases, git is able to apply\n>> the patch on branch_b automatically (e.g. if there's only a line\n>> offset). In such cases, will \"git log --cherry-pick\" ignore these\n>> cherry-picks like it ignores cherry-picks that were applied without\n>> any problem?\n>\n> With --cherry-pick, log omits those commits whose associated patch has\n> the same patch-id (see \"git patch-id\").\n>\n> Michael\n>\n\nIs there another way to get over this (a commit that was cherry-picked\nfrom branch_a to branch_b and had to be changed to be applied on\nbranch_b)?\n\nThanks,\nErez\n"},{"id":"144794","messageId":"AANLkTik9FJ4skKOxH3x5QHqM1S5-6H4ae8MEPN1dnwab@mail.gmail.com","threadId":"24217","inReplyTo":"AANLkTinSFdB28QpfcqAuVCFzho0P_H_MG6_i2ODKiWuD@mail.gmail.com","subject":"Re: git log and cherry-picks","fromName":"Antriksh Pany","fromEmail":"antriksh.pany@gmail.com","sentAt":"2010-07-05T05:39:20Z","receivedAt":"2010-07-05T05:39:20Z","isPatch":false,"sender":{"key":"antriksh.pany@gmail.com","avatar":null},"body":"Well, I typically leave the commit subject (first line) the same even\nif I make minor modifications to a cherry-picked commit.\n\nIf that's the case with you, you can write a basic shell script that\nlooks at the commit message and discards duplicates.\n\nCheers\nAntriksh Pany\n\nOn Tue, Jun 29, 2010 at 1:55 AM, Erez Zilber wrote:\n> On Mon, Jun 28, 2010 at 10:07 PM, Michael J Gruber\n> wrote:\n>> Erez Zilber venit, vidit, dixit 28.06.2010 18:02:\n>>> Hi,\n>>>\n>>> I saw that I can run git log with '--cherry-pick'. With this, if I run\n>>> \"git log --cherry-pick branch_a..branch_b\", it doesn't show\n>>> differences that are caused by cherry picks.\n>>>\n>>> My question is: sometimes, cherry picking from branch_a to branch_b is\n>>> not immediate, and I need to adapt the patch that was committed on\n>>> branch_a to apply on branch_b. In other cases, git is able to apply\n>>> the patch on branch_b automatically (e.g. if there's only a line\n>>> offset). In such cases, will \"git log --cherry-pick\" ignore these\n>>> cherry-picks like it ignores cherry-picks that were applied without\n>>> any problem?\n>>\n>> With --cherry-pick, log omits those commits whose associated patch has\n>> the same patch-id (see \"git patch-id\").\n>>\n>> Michael\n>>\n>\n> Is there another way to get over this (a commit that was cherry-picked\n> from branch_a to branch_b and had to be changed to be applied on\n> branch_b)?\n>\n> Thanks,\n> Erez\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n>\n"}]}