From: Tomas Carnecky <tom@dbservice.com>
Date: Wed, 11 Nov 2009 14:08:40 GMT
Subject: Re: Unhelpful "branch.master.remote = <nickname>" advice?
Message-ID: <48B54636-1825-48B3-BECD-4150A55B013F@dbservice.com>
In-Reply-To: <1257945756.26362.79.camel@heerbeest>


On Nov 11, 2009, at 2:22 PM, Jan Nieuwenhuizen wrote:

> Hi,
>
> git pull -r*) URL says:
>
>    If you often merge with the same branch, you may want to
>    configure the following variables in your configuration
>    file:
>
>        branch.master.remote = <nickname>
>        branch.master.merge = <remote-ref>
>        remote.<nickname>.url = <url>
>        remote.<nickname>.fetch = <refspec>

These are meant to be used with git-config(1):
git config branch.master.remote <nickname>

Or if you want to manually edit the config file, add this:

[branch "master"]
     remote = <nickname>

etc.

>
> and after cut-and-pasting that into .git/config, replacing
> <foo> with values, I get
>
>    $ git pull -r http://github.com/../../master
>    fatal: bad config file line 17 in .git/config
>
> where line 17 is [without any indentation]
>
>    branch.master.remote = eddy
>
> This is with git version version 1.6.3.3
>
> Greetings,
> Jan.  -- who just finds out the uninstall target is missing?!?
> 	 See attached.

Next time please send patches inline, it's easier to review them that  
way.

>
> *) I've been wondering why GIT lacks a "update", ie
>   pull-without-merge command.  You almost never want
>   to git pull /without/ -r?

As 'pull == fetch + merge' (pull -r == fetch + rebase), pull without  
merge would be fetch.

tom