Re: 'upstream' branches.

On Sat, 2007-05-05 at 19:44 +0200, Alex Riesen wrote:

David Woodhouse, Sat, May 05, 2007 14:29:26 +0200:

quoted

[remote "origin"]
        url = ssh://git.infradead.org/~/public_git/foo-2.6.git
        fetch = +refs/heads/*:refs/remotes/origin/*
	fetch = +refs/heads/mtd:refs/heads/mtd
	fetch = +refs/heads/linus:refs/heads/linus

These pluses request overwriting of the local reference even if it has
more commits than the remote ("is newer"). Are you sure you want that?

quoted

What I have at the moment isn't ideal because I think pulling from the
'mtd' tree will fail if the 'linus' branch there is older than the local
clone's 'linus' branch. But it mostly works.

Is there a better way?

I would just remove the pluses. git-fetch will say that the branch is
already up-to-date, if the local branch already has everything the
remote has.

Then after I pull from Linus' tree, I can't pull from the mtd tree -- it
complains that the 'linus' branch there can't be fast-forwarded, and
refuses to pull the 'master' branch.

I think what I actually want is an 'only fast-forward, but don't error
if you can't' option.

-- 
dwmw2