Re: Confused about tracking git master

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Apr 18, 2006 at 11:08:48AM -0700, Seth Falcon wrote:
> 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
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]