From: Michael J Gruber <git@drmicha.warpmail.net>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>, Jakub Narebski <jnareb@gmail.com>
Subject: Re: [PATCH 3/3] Documentation: Allow custom diff tools to be specified in 'diff.tool'
Date: Mon, 04 Apr 2011 10:55:31 +0200 [thread overview]
Message-ID: <4D998783.8060209@drmicha.warpmail.net> (raw)
In-Reply-To: <1301840722-24344-4-git-send-email-artagnon@gmail.com>
Ramkumar Ramachandra venit, vidit, dixit 03.04.2011 16:25:
> Apart from the list of "valid values", 'diff.tool' can take any value,
> provided there is a corresponding 'difftool.<tool>.cmd' option.
>
> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
> ---
> Documentation/diff-config.txt | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
> index 8c1732f..7f985a3 100644
> --- a/Documentation/diff-config.txt
> +++ b/Documentation/diff-config.txt
> @@ -59,7 +59,9 @@ diff.tool::
> Controls which diff tool is used. `diff.tool` overrides
> `merge.tool` when used by linkgit:git-difftool[1] and has
> the same valid values as `merge.tool` minus "tortoisemerge"
> - and plus "kompare".
> + and plus "kompare". Any other value is treated is custom
"treated as a custom"
> + diff tool and there must be a corresponding
> + 'difftool.<tool>.cmd' option.
>
> diff.<driver>.command::
> Defines the command that implements the custom diff driver.
next prev parent reply other threads:[~2011-04-04 8:59 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 [this message]
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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D998783.8060209@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--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.
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).