From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>, Jakub Narebski <jnareb@gmail.com>
Subject: Re: [PATCH 2/4] Documentation: Add diff.<driver>.* to config
Date: Thu, 7 Apr 2011 08:33:43 +0530 [thread overview]
Message-ID: <20110407030341.GA28334@kytes> (raw)
In-Reply-To: <7vwrj7i2je.fsf@alter.siamese.dyndns.org>
Hi Junio,
Junio C Hamano writes:
> Ramkumar Ramachandra <artagnon@gmail.com> writes:
>
> > +diff.<driver>.command::
> > + The custom diff driver command. See linkgit:gitattributes[5]
> > + for details.
>
> This is about "custom", but I thought it was pointed out that ...
>
> > +diff.<driver>.xfuncname::
> > + The regular expression that the custom diff driver should use
> > + to recognize the hunk header. A built-in pattern may also be
> > + used. See linkgit:gitattributes[5] for details.
> > +
> > +diff.<driver>.binary::
> > + Set this option to true to make the custom diff driver treat
> > + files as binary. See linkgit:gitattributes[5] for details.
>
> ... these two don't have much to do with "custom". You seem to have
> dropped "custom" from the remaining three, and I think their description
> without "custom" makes more sense.
>
> It is not a problem for me to just amend these two and lose "custom" when
> I apply this patch (if there is no other glitch in it, of course), but I
Right. I was a little confused about these two, but yeah- I see now
that dependence on `diff.<driver>.command` is equivalent to saying
that an option applies to a "custom" diff driver. Please amend to
lose the "custom".
Thanks.
-- Ram
next prev parent reply other threads:[~2011-04-07 3:04 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-01 8:47 [PATCH] Documentation: Document diff.<tool>.* and filter.<driver>.* in config Ramkumar Ramachandra
2011-04-01 9:18 ` Jakub Narebski
2011-04-01 10:43 ` [PATCH v2] " Ramkumar Ramachandra
2011-04-01 13:50 ` Jakub Narebski
2011-04-01 13:56 ` Michael J Gruber
2011-04-03 14:25 ` [PATCH v3 0/3] Document diff and filter drivers " Ramkumar Ramachandra
2011-04-03 14:25 ` [PATCH 1/3] Documentation: Add filter.<driver>.* to config Ramkumar Ramachandra
2011-04-04 8:46 ` Michael J Gruber
2011-04-03 14:25 ` [PATCH 2/3] Documentation: Add diff.<driver>.* " Ramkumar Ramachandra
2011-04-04 8:54 ` Michael J Gruber
2011-04-04 17:24 ` Junio C Hamano
2011-04-03 14:25 ` [PATCH 3/3] Documentation: Allow custom diff tools to be specified in 'diff.tool' Ramkumar Ramachandra
2011-04-04 8:55 ` Michael J Gruber
2011-04-06 9:57 ` [PATCH v4 0/4] Document diff and filter drivers in config Ramkumar Ramachandra
2011-04-06 9:57 ` [PATCH 1/4] Documentation: Add filter.<driver>.* to config Ramkumar Ramachandra
2011-04-06 11:27 ` Michael J Gruber
2011-04-06 12:51 ` Ramkumar Ramachandra
2011-04-06 16:50 ` Junio C Hamano
2011-04-06 18:09 ` Ramkumar Ramachandra
2011-04-07 11:57 ` Michael J Gruber
2011-04-07 16:19 ` Ramkumar Ramachandra
2011-04-06 9:57 ` [PATCH 2/4] Documentation: Add diff.<driver>.* " Ramkumar Ramachandra
2011-04-06 9:57 ` [PATCH 3/4] Documentation: Allow custom diff tools to be specified in 'diff.tool' Ramkumar Ramachandra
2011-04-06 9:57 ` [PATCH 4/4] Documentation: Minor language improvements to merge-config Ramkumar Ramachandra
2011-04-06 18:46 ` [PATCH v5 0/4] Document diff and filter drivers in config Ramkumar Ramachandra
2011-04-06 18:46 ` [PATCH 1/4] Documentation: Add filter.<driver>.* to config Ramkumar Ramachandra
2011-04-06 18:46 ` [PATCH 2/4] Documentation: Add diff.<driver>.* " Ramkumar Ramachandra
2011-04-06 19:48 ` Junio C Hamano
2011-04-07 3:03 ` Ramkumar Ramachandra [this message]
2011-04-06 18:46 ` [PATCH 3/4] Documentation: Allow custom diff tools to be specified in 'diff.tool' Ramkumar Ramachandra
2011-04-06 18:46 ` [PATCH 4/4] Documentation: Minor language improvements to merge-config Ramkumar Ramachandra
2011-04-07 12:47 ` [PATCH v4 0/4] Document diff and filter drivers in config Michael J Gruber
2011-04-07 12:48 ` Michael J Gruber
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110407030341.GA28334@kytes \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).