From: Ramkumar Ramachandra Date: Wed, 06 Apr 2011 18:46:50 GMT Subject: [PATCH 3/4] Documentation: Allow custom diff tools to be specified in 'diff.tool' Message-ID: <1302115611-1950-4-git-send-email-artagnon@gmail.com> In-Reply-To: <1302115611-1950-1-git-send-email-artagnon@gmail.com> 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 --- Documentation/diff-config.txt | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 0796d5e..d604484 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. -- 1.7.4.rc1.7.g2cf08.dirty