From: Alex Riesen <raa.lkml@gmail.com>
Date: Sat, 05 May 2007 17:44:16 GMT
Subject: Re: 'upstream' branches.
Message-ID: <20070505174416.GA2898@steel.home>
In-Reply-To: <1178368166.11851.60.camel@pmac.infradead.org>

David Woodhouse, Sat, May 05, 2007 14:29:26 +0200:
> [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?

> 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.