From: Santi Béjar <santi@agolina.net>
Date: Sun, 29 Mar 2009 10:54:30 GMT
Subject: Re: [PATCH 1/4] Documentation: enhance branch.<name>.{remote,merge}
Message-ID: <adf1fd3d0903290354y7ac26542r8d82309a7247eacc@mail.gmail.com>
In-Reply-To: <76718490903281838s1bc7e908l4702cf9ab020189@mail.gmail.com>

2009/3/29 Jay Soffian <jaysoffian@gmail.com>:
> On Sat, Mar 28, 2009 at 7:10 PM, Santi Béjar <santi@agolina.net> wrote:
>>  branch.<name>.merge::
>> +       It defines, together with branch.<name>.remote, the tracking branch
>> +       for the current branch. It tells 'git-fetch'/'git-pull' which
>> +       branch to merge.
>
> I think it would be clearer to say "the upstream branch for the
> current branch", since
> it could very well be a local branch, not necessarily a remote tracking branch.

It makes sense, thanks.

Santi