From: Junio C Hamano <junkio@cox.net>
To: Martin Waitz <tali@admingilde.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH 0/2] Custom low-level merge driver support.
Date: Wed, 18 Apr 2007 08:56:25 -0700 [thread overview]
Message-ID: <7vps61isly.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20070418153445.GC12888@admingilde.org> (Martin Waitz's message of "Wed, 18 Apr 2007 17:34:45 +0200")
Martin Waitz <tali@admingilde.org> writes:
> On Wed, Apr 18, 2007 at 12:48:48PM +0200, Johannes Schindelin wrote:
>> On Wed, 18 Apr 2007, Junio C Hamano wrote:
>>
>> > [merge]
>> > driver = ancient merge %A %O %B
>>
>> Why not do something like
>>
>> [merge.driver]
>> ancient = merge %A %O %B
>
> or
>
> [merge "ancient"]
> driver = merge %A %O %B
Actually, I've considered the latter.
Johannes's goes against the usual three-level configuration
variable naming rules. If you have 'user definable' part in the
name, that should be at the second level.
Which yours does.
The only reason I did not do it your way was because we would
need to have three lines per driver (one [merge "foo"] section
per driver, a "driver" line, and a blank line for readability
after that), which at the time I wrote it felt a bit wasteful,
and it was late. But I think I like yours much better.
It probably is trivial to change the rule before it hits 'next'.
next prev parent reply other threads:[~2007-04-18 15:56 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-18 9:21 [PATCH 0/2] Custom low-level merge driver support Junio C Hamano
2007-04-18 9:21 ` [PATCH 1/2] " Junio C Hamano
2007-04-18 10:36 ` Johannes Sixt
2007-04-18 10:55 ` Johannes Schindelin
2007-04-18 9:21 ` [PATCH 2/2] Allow the default low-level merge driver to be configured Junio C Hamano
2007-04-18 10:48 ` [PATCH 0/2] Custom low-level merge driver support Johannes Schindelin
2007-04-18 15:34 ` Martin Waitz
2007-04-18 15:56 ` Junio C Hamano [this message]
2007-04-18 16:08 ` Martin Waitz
2007-04-18 16:16 ` Linus Torvalds
2007-04-18 17:10 ` Junio C Hamano
2007-04-18 18:45 ` Linus Torvalds
2007-04-18 19:00 ` Junio C Hamano
2007-04-18 19:23 ` Junio C Hamano
2007-04-18 19:43 ` Linus Torvalds
2007-04-18 19:51 ` Linus Torvalds
2007-04-18 20:13 ` Junio C Hamano
2007-04-18 20:35 ` Linus Torvalds
2007-04-18 20:09 ` David Lang
2007-04-18 21:01 ` Junio C Hamano
2007-04-19 7:52 ` Martin Waitz
2007-04-19 8:08 ` Junio C Hamano
2007-04-18 18:28 ` [PATCH] Custom low-level merge driver: change the configuration scheme Junio C Hamano
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=7vps61isly.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=tali@admingilde.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).