From: Junio C Hamano <junkio@cox.net>
To: "Santi Béjar" <sbejar@gmail.com>
Cc: git@vger.kernel.org, Yann Dirson <ydirson@altern.org>
Subject: Re: [PATCH] config.txt: update branch.<name>.merge documentation
Date: Sat, 03 Feb 2007 16:38:30 -0800 [thread overview]
Message-ID: <7v4pq221vd.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <8aa486160702031630l4fd3e29did4f249713cf2ce81@mail.gmail.com> (Santi Béjar's message of "Sun, 4 Feb 2007 01:30:02 +0100")
"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.
prev parent reply other threads:[~2007-02-04 0:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-03 15:29 [PATCH] config.txt: update branch.<name>.merge documentation Santi Béjar
2007-02-03 15:56 ` Yann Dirson
2007-02-03 16:19 ` Santi Béjar
2007-02-03 16:29 ` Yann Dirson
2007-02-04 0:30 ` Santi Béjar
2007-02-04 0:38 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v4pq221vd.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=sbejar@gmail.com \
--cc=ydirson@altern.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.