pxa-devel back-merge / cherry pick request

Daniel Mack daniel at caiaq.de
Mon May 31 09:25:05 EDT 2010


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




More information about the linux-arm-kernel mailing list