From: Alex Riesen <raa.lkml@gmail.com>
Date: Sat, 05 May 2007 22:52:49 GMT
Subject: Re: 'upstream' branches.
Message-ID: <20070505225249.GE2898@steel.home>
In-Reply-To: <1178387429.17680.35.camel@shinybook.infradead.org>

David Woodhouse, Sat, May 05, 2007 19:50:28 +0200:
> > > 
> > > 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.

Which got me by surprise (just tried). I though it'd notice that all
the commits are already present...

Experts, is it really supposed to be that way?