Re: : Networking

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Apr 26, 2005, 15:40 UTC
Message-ID: <Pine.LNX.4.21.0504261114090.30848-100000@iabervon.org>
In-Reply-To: <Pine.LNX.4.58.0504260746320.18901@ppc970.osdl.org>

On Tue, 26 Apr 2005, Linus Torvalds wrote:

Show 10 quoted lines

> On Tue, 26 Apr 2005, Andrew Morton wrote:
> > 
> 
> The only thing you should be a bit careful about is to remember what the 
> "heads" at different points were. In particular, you want to remember 
> where you merged with me last was. I've started tagging my releases with 
> the git tag facility (_not_ the pasky one, but I think pasky will start 
> picking up on that soon enough), so finding a specific release will be 
> easy, but if you ever do a non-release merge you'll just have to tag it 
> yourself.

Your tag system is in the "cogito-0.8" release, plus a pasky-style way of keeping track of what tags you have in your repository.

Show 7 quoted lines

> > d) To generate davem's tree (patch against linus's current tree (ie: patch
> >    against 2.6.12-rc3+linus.patch)):
> > 
> > 	git pull git-net
> 
> Yes. This should have merged the two (assuming "git pull" does what I 
> think it does).

I think git pull only downloads the contents of the repo and saves the new head in a separate file. You're left to do the merge yourself, in case what you actually wanted to do was just read the patches in the remote repo without merging them.

You probably need a "git merge git-net" here, and things will be in the state that Linus expects.

	-Daniel
*This .sig left intentionally blank*