Re: [PATCH 3/3] Documentation: Allow custom diff tools to be specified in 'diff.tool'

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Apr 4, 2011, 08:55 UTC
Message-ID: <4D998783.8060209@drmicha.warpmail.net>
In-Reply-To: <1301840722-24344-4-git-send-email-artagnon@gmail.com>

Ramkumar Ramachandra venit, vidit, dixit 03.04.2011 16:25:

Show 18 quoted lines

> 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"

Show 5 quoted lines

> +	diff tool and there must be a corresponding
> +	'difftool.<tool>.cmd' option.
>  
>  diff.<driver>.command::
>  	Defines the command that implements the custom diff driver.