pxa-devel back-merge / cherry pick request

[Mark Brown]

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.