From: Ramkumar Ramachandra Date: Wed, 6 Apr 2011 18:46:50 +0000 (+0530) Subject: Documentation: Allow custom diff tools to be specified in 'diff.tool' X-Git-Tag: v1.7.5.4~13^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=48672b3dc70e8f70291d974f0eb54cbac7f498e0;p=git.git Documentation: Allow custom diff tools to be specified in 'diff.tool' Apart from the list of "valid values", 'diff.tool' can take any value, provided there is a corresponding 'difftool..cmd' option. Also, describe this option just before the 'difftool.*' options. Helped-by: Michael J Gruber Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano --- diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index bbf475348..2b1605f5c 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -55,12 +55,6 @@ diff.suppressBlankEmpty:: A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false. -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". - diff..command:: The custom diff driver command. See linkgit:gitattributes[5] for details. @@ -88,3 +82,11 @@ diff..wordregex:: diff..cachetextconv:: Set this option to true to make the diff driver cache the text conversion outputs. See linkgit:gitattributes[5] for details. + +diff.tool:: + The diff tool to be used by linkgit:git-difftool[1]. This + option overrides `merge.tool`, and has the same valid built-in + values as `merge.tool` minus "tortoisemerge" and plus + "kompare". Any other value is treated as a custom diff tool, + and there must be a corresponding `difftool..cmd` + option.