Re: Is it possible to do daily Linus' Git-to-ToI merges locally?

Hi.

On Mon, 2008-07-28 at 18:53 -0700, Kenneth Crudup wrote:
> IOW, let's say I have your latest git. Is it possible to somehow merge
> in Linus' daily kernel.org git snapshots with whatever I have from you
> currently?
> 
> Would I have to do "git cherry-pick" on each commit, or is there a better
> way? Git is still somewhat mysterious to me (even after looking at both
> trees with "gitk").
> 
> I only ask 'cause I know you're busy, but there's a feature in the last
> couple of commits I'd like to really have (I think one of 'em fixes why
> my box just up and panic()s at random times under load with the current
> (7/25) ToI git.)

That should certainly be possible. The best way to work is to have two
branches, one for Linus' tree and one for mine. If you checkout the
Linus branch and then fetch the latest changes, then checkout my branch
and do a git-merge <name-of-Linus-branch>, you should end up with what
you're after. Just to be safe, I'd actually make a second Nigel branch
to merge into. That way you still have what you last pulled from my
branch in an easily accessible form.

Regards,

Nigel