Setup question for the local git repo from github

[Christian Stimming]

Am Samstag, 30. April 2011 schrieb John Ralls:
> > But at this point the "git-update" script results in the following error:
> >> You asked to pull from the remote 'origin', but did not specify
> >> a branch. Because this is not the default configured remote
> >> for your current branch, you must specify a branch on the command line.
> >> pull --rebase origin: command returned error: 1
> > 
> > This is git-1.7.0.4. I then tried to run
> > 
> >  git-update trunk
> > 
> > which seemed to give me what I expected. But running the command again
> > will still give me the above error message. Only if I run this with the
> > additional "trunk" command I'll get what I expected.
> > 
> > What am I missing?
> 
> That you're checked out in the "master" branch and the github repo doesn't
> have one of those. I think that if you add
> [branch "master"]
>         remote = origin
>         merge = refs/heads/trunk
> to your .git/config git will know what you want to update.

Turns out the creation of the "master" branch needs to use a different 
tracking argument. I've changed the wiki accordingly. Now it works fine.

Regards,

Christian