From: Antriksh Pany <antriksh.pany@gmail.com>
To: Erez Zilber <erezzi.list@gmail.com>
Cc: Michael J Gruber <git@drmicha.warpmail.net>, git <git@vger.kernel.org>
Subject: Re: git log and cherry-picks
Date: Mon, 5 Jul 2010 11:09:20 +0530 [thread overview]
Message-ID: <AANLkTik9FJ4skKOxH3x5QHqM1S5-6H4ae8MEPN1dnwab@mail.gmail.com> (raw)
In-Reply-To: <AANLkTinSFdB28QpfcqAuVCFzho0P_H_MG6_i2ODKiWuD@mail.gmail.com>
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 <erezzi.list@gmail.com> wrote:
> On Mon, Jun 28, 2010 at 10:07 PM, Michael J Gruber
> <git@drmicha.warpmail.net> 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
>
prev parent reply other threads:[~2010-07-05 5:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-28 16:02 git log and cherry-picks Erez Zilber
2010-06-28 19:07 ` Michael J Gruber
2010-06-28 20:25 ` Erez Zilber
2010-07-05 5:39 ` Antriksh Pany [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTik9FJ4skKOxH3x5QHqM1S5-6H4ae8MEPN1dnwab@mail.gmail.com \
--to=antriksh.pany@gmail.com \
--cc=erezzi.list@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).