{"thread":{"id":"3908","subject":"Confused about tracking git master","startedAt":"2006-04-18T18:08:48Z","lastAt":"2006-04-18T19:47:18Z","messageCount":3,"participants":["Seth Falcon","Nicolas Vilz"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"18815","messageId":"m2wtdmg3in.fsf@ziti.fhcrc.org","threadId":"3908","inReplyTo":null,"subject":"Confused about tracking git master","fromName":"Seth Falcon","fromEmail":"sethfalcon@gmail.com","sentAt":"2006-04-18T18:08:48Z","receivedAt":"2006-04-18T18:08:48Z","isPatch":false,"sender":{"key":"sethfalcon@gmail.com","avatar":"https://gravatar.com/avatar/fd62fe73d3013b12fce71d5269ec52eaca3c4cee479efc6eea3603d6f1d8bf8d?d=mp&s=160"},"body":"Hi,\n\nI'm tracking git and somehow getting confused about how to get\nupdates.\n\nTo start, I did: git clone git://git.kernel.org/pub/scm/git/git.git\n\nTo get updates, I _think_ all I have to do is 'git pull'.  Doing so I\nget:\n\n    Unpacking 157 objects\n     100% (157/157) done\n    * refs/heads/todo: same as branch 'todo' of git://git.kernel.org/pub/scm/git/git\n    * refs/heads/maint: same as branch 'maint' of git://git.kernel.org/pub/scm/git/git\n    * refs/heads/origin: same as branch 'master' of git://git.kernel.org/pub/scm/git/git\n    * refs/heads/pu: does not fast forward to branch 'pu' of git://git.kernel.org/pub/scm/git/git;\n      not updating.       \n\nThen when I do git whatchanged, the last change is on Saturday the\n15th.  I'm figuring there has probably been at least one commit since\nthen?  So I tried 'git checkout origin' and then repeated the\nwhatchanged call and see:\n\n    diff-tree 2855d58... (from bb99661...)\n    Author: Junio C Hamano <junkio@cox.net>\n    Date:   Mon Apr 17 17:46:07 2006 -0700   \n\nIs there a step I'm missing?  Or am I just misunderstanding what to\nexpect?  Clarification on either of those would be appreciated.\n\nThanks,\n\n+ seth\n"},{"id":"18823","messageId":"20060418185937.GD13672@vsectoor.geht-ab-wie-schnitzel.de","threadId":"3908","inReplyTo":"m2wtdmg3in.fsf@ziti.fhcrc.org","subject":"Re: Confused about tracking git master","fromName":"Nicolas Vilz","fromEmail":"niv@iaglans.de","sentAt":"2006-04-18T18:59:37Z","receivedAt":"2006-04-18T18:59:37Z","isPatch":false,"sender":{"key":"niv@iaglans.de","avatar":"https://gravatar.com/avatar/e4d43a32d721241212d4edb1d2210327e28423c913071b4bfeeaa0ce15296110?d=mp&s=160"},"body":"On Tue, Apr 18, 2006 at 11:08:48AM -0700, Seth Falcon wrote:\n> To get updates, I _think_ all I have to do is 'git pull'.  Doing so I\n> get:\n> \n>     Unpacking 157 objects\n>      100% (157/157) done\n>     * refs/heads/todo: same as branch 'todo' of git://git.kernel.org/pub/scm/git/git\n>     * refs/heads/maint: same as branch 'maint' of git://git.kernel.org/pub/scm/git/git\n>     * refs/heads/origin: same as branch 'master' of git://git.kernel.org/pub/scm/git/git\n>     * refs/heads/pu: does not fast forward to branch 'pu' of git://git.kernel.org/pub/scm/git/git;\n>       not updating.       \n> \n[..]\n> \n> Is there a step I'm missing?  Or am I just misunderstanding what to\n> expect?  Clarification on either of those would be appreciated.\n\nYou are trapped with the pu branch imho, like many others before *G* ... \nsimply do a \n\nPull: +refs/heads/pu:refs/heads/pu\n\nin your .git/remotes/origin file or remove that pu line...\n\nGreetings\nNicolas\n"},{"id":"18825","messageId":"m2y7y2eke1.fsf@ziti.fhcrc.org","threadId":"3908","inReplyTo":"20060418185937.GD13672@vsectoor.geht-ab-wie-schnitzel.de","subject":"Re: Confused about tracking git master","fromName":"Seth Falcon","fromEmail":"sethfalcon@gmail.com","sentAt":"2006-04-18T19:47:18Z","receivedAt":"2006-04-18T19:47:18Z","isPatch":false,"sender":{"key":"sethfalcon@gmail.com","avatar":"https://gravatar.com/avatar/fd62fe73d3013b12fce71d5269ec52eaca3c4cee479efc6eea3603d6f1d8bf8d?d=mp&s=160"},"body":"Nicolas Vilz <niv@iaglans.de> writes:\n> You are trapped with the pu branch imho, like many others before *G* ... \n> simply do a \n>\n> Pull: +refs/heads/pu:refs/heads/pu\n>\n> in your .git/remotes/origin file or remove that pu line...\n\nThank you!  That seems to get me going again.  But, isn't this going\nto trip up other newbies?  I just tried a fresh git clone and the pu\nbranch comes in...\n\nIt would improve one's first impressions to not have to edit\n.git/remotes/origin (although it is instructional) just to stay up to\ndate with git.\n\nCheers,\n\n+ seth\n"}]}