# git log and cherry-picks 4 messages from 2010-06-28 to 2010-07-05. Participants: Erez Zilber, Michael J Gruber, Antriksh Pany. Thread: https://gitlist.dev/t/24217 ## Erez Zilber, 2010-06-28 16:02 Subject: git log and cherry-picks Message-ID: URL: https://gitlist.dev/e/AANLkTil6-rd5y9xcTVz4kJ4O2jL9ZdXYo1JrgYA3sM6N%40mail.gmail.com ``` Hi, I saw that I can run git log with '--cherry-pick'. With this, if I run "git log --cherry-pick branch_a..branch_b", it doesn't show differences that are caused by cherry picks. My question is: sometimes, cherry picking from branch_a to branch_b is not immediate, and I need to adapt the patch that was committed on branch_a to apply on branch_b. In other cases, git is able to apply the patch on branch_b automatically (e.g. if there's only a line offset). In such cases, will "git log --cherry-pick" ignore these cherry-picks like it ignores cherry-picks that were applied without any problem? Thanks, Erez ``` ## Michael J Gruber, 2010-06-28 19:07 Subject: Re: git log and cherry-picks Message-ID: <4C28F300.1060506@drmicha.warpmail.net> URL: https://gitlist.dev/e/4C28F300.1060506%40drmicha.warpmail.net In-Reply-To: ``` Erez Zilber venit, vidit, dixit 28.06.2010 18:02: > Hi, > > I saw that I can run git log with '--cherry-pick'. With this, if I run > "git log --cherry-pick branch_a..branch_b", it doesn't show > differences that are caused by cherry picks. > > My question is: sometimes, cherry picking from branch_a to branch_b is > not immediate, and I need to adapt the patch that was committed on > branch_a to apply on branch_b. In other cases, git is able to apply > the patch on branch_b automatically (e.g. if there's only a line > offset). In such cases, will "git log --cherry-pick" ignore these > cherry-picks like it ignores cherry-picks that were applied without > any problem? With --cherry-pick, log omits those commits whose associated patch has the same patch-id (see "git patch-id"). Michael ``` ## Erez Zilber, 2010-06-28 20:25 Subject: Re: git log and cherry-picks Message-ID: URL: https://gitlist.dev/e/AANLkTinSFdB28QpfcqAuVCFzho0P_H_MG6_i2ODKiWuD%40mail.gmail.com In-Reply-To: <4C28F300.1060506@drmicha.warpmail.net> ``` On Mon, Jun 28, 2010 at 10:07 PM, Michael J Gruber wrote: > Erez Zilber venit, vidit, dixit 28.06.2010 18:02: >> Hi, >> >> I saw that I can run git log with '--cherry-pick'. With this, if I run >> "git log --cherry-pick branch_a..branch_b", it doesn't show >> differences that are caused by cherry picks. >> >> My question is: sometimes, cherry picking from branch_a to branch_b is >> not immediate, and I need to adapt the patch that was committed on >> branch_a to apply on branch_b. In other cases, git is able to apply >> the patch on branch_b automatically (e.g. if there's only a line >> offset). In such cases, will "git log --cherry-pick" ignore these >> cherry-picks like it ignores cherry-picks that were applied without >> any problem? > > With --cherry-pick, log omits those commits whose associated patch has > the same patch-id (see "git patch-id"). > > Michael > Is there another way to get over this (a commit that was cherry-picked from branch_a to branch_b and had to be changed to be applied on branch_b)? Thanks, Erez ``` ## Antriksh Pany, 2010-07-05 05:39 Subject: Re: git log and cherry-picks Message-ID: URL: https://gitlist.dev/e/AANLkTik9FJ4skKOxH3x5QHqM1S5-6H4ae8MEPN1dnwab%40mail.gmail.com In-Reply-To: ``` Well, I typically leave the commit subject (first line) the same even if I make minor modifications to a cherry-picked commit. If that's the case with you, you can write a basic shell script that looks at the commit message and discards duplicates. Cheers Antriksh Pany On Tue, Jun 29, 2010 at 1:55 AM, Erez Zilber wrote: > On Mon, Jun 28, 2010 at 10:07 PM, Michael J Gruber > wrote: >> Erez Zilber venit, vidit, dixit 28.06.2010 18:02: >>> Hi, >>> >>> I saw that I can run git log with '--cherry-pick'. With this, if I run >>> "git log --cherry-pick branch_a..branch_b", it doesn't show >>> differences that are caused by cherry picks. >>> >>> My question is: sometimes, cherry picking from branch_a to branch_b is >>> not immediate, and I need to adapt the patch that was committed on >>> branch_a to apply on branch_b. In other cases, git is able to apply >>> the patch on branch_b automatically (e.g. if there's only a line >>> offset). In such cases, will "git log --cherry-pick" ignore these >>> cherry-picks like it ignores cherry-picks that were applied without >>> any problem? >> >> With --cherry-pick, log omits those commits whose associated patch has >> the same patch-id (see "git patch-id"). >> >> Michael >> > > Is there another way to get over this (a commit that was cherry-picked > from branch_a to branch_b and had to be changed to be applied on > branch_b)? > > Thanks, > Erez > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at  http://vger.kernel.org/majordomo-info.html > ```