Re: git log and cherry-picks

From: Erez Zilber <erezzi.list@gmail.com>
Date: Jun 28, 2010, 20:25 UTC
Message-ID: <AANLkTinSFdB28QpfcqAuVCFzho0P_H_MG6_i2ODKiWuD@mail.gmail.com>
In-Reply-To: <4C28F300.1060506@drmicha.warpmail.net>

On Mon, Jun 28, 2010 at 10:07 PM, Michael J Gruber <git@drmicha.warpmail.net> wrote:

Show 20 quoted lines

> 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