From: Alex Riesen <raa.lkml@gmail.com>
Date: Sun, 07 Oct 2007 20:10:48 GMT
Subject: Re: How to pick a commit from another git tree?
Message-ID: <20071007201048.GA2765@steel.home>
In-Reply-To: <000101c80907$d461a810$04ac10ac@Jocke>

Joakim Tjernlund, Sun, Oct 07, 2007 19:31:00 +0200:
> This is probably a somewhat stupid question but I havn't had a need until now so here goes:
> There is a commit in David Millers tree:
> http://git.kernel.org/?p=linux/kernel/git/davem/bak-net-2.6.24.git;a=commit;h=bbb4c0c35a4c2aed5e025b668c8dfc99c5b74cff
> that hasn't made it into 2.6.23, but will go into 2.6.24. 
> I need this fix on top of 2.6.23(once it is released).

$ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/davem/bak-net-2.6.24.git
$ git cherry-pick bbb4c0c35a4c2aed5e025b668c8dfc99c5b74cff

> Now I wonder how to best add this fix to my tree. Once this fix hits linus tree and I pull
> linus tree, I don't wan't a conflict as I already have this fix in my tree.

Depending on the state the Davids tree ends up when it is merge into
Linus' tree you may or may not get a conflict. It is not in your hands
either way.

> Should I just pull Davids tree? Or should I cherry-pick this one commit?
> Or something else?

I would just cherry-pick it, and revert it (or hard-reset my tree to
Linus' tree) if it conflicts later.