From: Junio C Hamano <junkio@cox.net>
Date: Sun, 04 Feb 2007 00:38:30 GMT
Subject: Re: [PATCH] config.txt: update branch.<name>.merge documentation
Message-ID: <7v4pq221vd.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <8aa486160702031630l4fd3e29did4f249713cf2ce81@mail.gmail.com>

"Santi Béjar" <sbejar@gmail.com> writes:

> On 2/3/07, Santi Béjar <sbejar@gmail.com> wrote:
>> --- a/Documentation/config.txt
>> +++ b/Documentation/config.txt
>> @@ -233,11 +233,12 @@ branch.<name>.remote::
>>  branch.<name>.merge::
>>         When in branch <name>, it tells `git fetch` the default refspec to
>>         be marked for merging in FETCH_HEAD. The value has exactly to match
>> -       a remote part of one of the refspecs which are fetched from the remote
>> -       given by "branch.<name>.remote".
>> +       the remote or local part of one of the refspecs which are fetched
>> +       from the remote given by "branch.<name>.remote".
>
> It is OK, but ...

Yeah, but I am starting to think that it was a mistake to allow
an additional way to express the same thing.

Reverting 80c797764 would make the implementation to match the
specification described in the original.