Re: Confused about tracking git master

From: Nicolas Vilz <niv@iaglans.de>
Date: Apr 18, 2006, 18:59 UTC
Message-ID: <20060418185937.GD13672@vsectoor.geht-ab-wie-schnitzel.de>
In-Reply-To: <m2wtdmg3in.fsf@ziti.fhcrc.org>

On Tue, Apr 18, 2006 at 11:08:48AM -0700, Seth Falcon wrote:

Show 11 quoted lines

> To get updates, I _think_ all I have to do is 'git pull'.  Doing so I
> get:
> 
>     Unpacking 157 objects
>      100% (157/157) done
>     * refs/heads/todo: same as branch 'todo' of git://git.kernel.org/pub/scm/git/git
>     * refs/heads/maint: same as branch 'maint' of git://git.kernel.org/pub/scm/git/git
>     * refs/heads/origin: same as branch 'master' of git://git.kernel.org/pub/scm/git/git
>     * refs/heads/pu: does not fast forward to branch 'pu' of git://git.kernel.org/pub/scm/git/git;
>       not updating.       
>

[..]

> 
> Is there a step I'm missing?  Or am I just misunderstanding what to
> expect?  Clarification on either of those would be appreciated.

You are trapped with the pu branch imho, like many others before *G* ... simply do a

Pull: +refs/heads/pu:refs/heads/pu

in your .git/remotes/origin file or remove that pu line...

Greetings Nicolas