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.<tool>.cmd' option. Also, describe this option just before the 'difftool.*' options. Helped-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra committed
Apr 7, 2011 at 00:16 UTC
48672b3dc70e8f70291d974f0eb54cbac7f498e0
1 file changed
+8
-6
Documentation/diff-config.txt
+8
-6
@@ -55,12 +55,6 @@ diff.suppressBlankEmpty::
55
A boolean to inhibit the standard behavior of printing a space
56
before each empty output line. Defaults to false.
57
58
-diff.tool::
59
- Controls which diff tool is used. `diff.tool` overrides
60
- `merge.tool` when used by linkgit:git-difftool[1] and has
61
- the same valid values as `merge.tool` minus "tortoisemerge"
62
- and plus "kompare".
63
-
58
diff.<driver>.command::
59
The custom diff driver command. See linkgit:gitattributes[5]
60
for details.
@@ -88,3 +82,11 @@ diff.<driver>.wordregex::
82
diff.<driver>.cachetextconv::
83
Set this option to true to make the diff driver cache the text
84
conversion outputs. See linkgit:gitattributes[5] for details.
85
+
86
+diff.tool::
87
+ The diff tool to be used by linkgit:git-difftool[1]. This
88
+ option overrides `merge.tool`, and has the same valid built-in
89
+ values as `merge.tool` minus "tortoisemerge" and plus
90
+ "kompare". Any other value is treated as a custom diff tool,
91
+ and there must be a corresponding `difftool.<tool>.cmd`
92
+ option.