From: daniel@caiaq.de (Daniel Mack)
To: linux-arm-kernel@lists.infradead.org
Subject: pxa-devel back-merge / cherry pick request
Date: Mon, 31 May 2010 15:25:05 +0200 [thread overview]
Message-ID: <20100531132505.GI2695@buzzloop.caiaq.de> (raw)
In-Reply-To: <20100531132233.GC14195@sirena.org.uk>
On Mon, May 31, 2010 at 02:22:34PM +0100, Mark Brown wrote:
> On Mon, May 31, 2010 at 03:13:17PM +0200, Daniel Mack wrote:
>
> > Just out of interest - why would cherry-picking be frowned upon?
> > Shouldn't git just ignore the commits it already knows when things are
> > pulled?
>
> No, git is content based. The merge should be a noop merge if the two
> sides end up being the same but you still end up with two different
> copies of the change in history.
Ah, the commit won't have the same ID anymore after it is cherry-picked,
of course.
That makes sense. Thanks for explaining.
Daniel
next prev parent reply other threads:[~2010-05-31 13:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-31 11:48 pxa-devel back-merge / cherry pick request Daniel Mack
2010-05-31 12:47 ` Russell King - ARM Linux
2010-05-31 13:13 ` Daniel Mack
2010-05-31 13:22 ` Mark Brown
2010-05-31 13:25 ` Daniel Mack [this message]
2010-05-31 14:26 ` Russell King - ARM Linux
2010-05-31 12:57 ` Nicolas Pitre
2010-05-31 13:25 ` Eric Miao
2010-05-31 14:02 ` [PATCH] ARM: pxa/raumfeld: check charge state after resume Daniel Mack
2010-05-31 15:02 ` Eric Miao
2010-05-31 14:29 ` pxa-devel back-merge / cherry pick request Russell King - ARM Linux
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=20100531132505.GI2695@buzzloop.caiaq.de \
--to=daniel@caiaq.de \
--cc=linux-arm-kernel@lists.infradead.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).