From: Michael J Gruber <git@drmicha.warpmail.net>
To: Erez Zilber <erezzi.list@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git log and cherry-picks
Date: Mon, 28 Jun 2010 21:07:44 +0200 [thread overview]
Message-ID: <4C28F300.1060506@drmicha.warpmail.net> (raw)
In-Reply-To: <AANLkTil6-rd5y9xcTVz4kJ4O2jL9ZdXYo1JrgYA3sM6N@mail.gmail.com>
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
next prev parent reply other threads:[~2010-06-28 19:07 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 [this message]
2010-06-28 20:25 ` Erez Zilber
2010-07-05 5:39 ` Antriksh Pany
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=4C28F300.1060506@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=erezzi.list@gmail.com \
--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).