From: Jeff King <peff@peff.net>
Date: Wed, 05 Jan 2011 16:44:16 GMT
Subject: Re: Tracking branches and pulling on remote
Message-ID: <20110105164416.GA4393@sigill.intra.peff.net>
In-Reply-To: <4D249EFA.5050408@seznam.cz>

On Wed, Jan 05, 2011 at 05:40:26PM +0100, Maaartin-1 wrote:

> >   $ git config remote.origin.fetch
> >   +refs/heads/*:refs/remotes/origin/*
> > 
> > which is a superset of what you added. If you run the git config command
> > I did above, what do you see?
> 
> No, there had been just the single line
> 
> refs/heads/master:refs/remotes/origin/master

Ah, OK, then that is the culprit. And the config line you added was a
reasonable solution (though you may consider simply switching it to a
wildcard to cover any future branches, too).

> OK, I swapped origin and upstream and made aliases
> 	fetchboth = !"git fetch; git fetch upstream"
> 	fetup = fetch upstream
> which is about everything I need for now.

Cool. You can also use "git fetch --all" to do the equivalent of your
fetchboth.

-Peff