diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2011-04-07 00:16:50 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-06 15:24:10 -0700 |
| commit | 48672b3dc70e8f70291d974f0eb54cbac7f498e0 (patch) | |
| tree | c050484b8a617acc53fe9619fab23b4f21666813 /Documentation/diff-config.txt | |
| parent | 90b94c26f7ae5241aa1d17c7076c103d9896b534 (diff) | |
| download | git-48672b3dc70e8f70291d974f0eb54cbac7f498e0.tar.gz git-48672b3dc70e8f70291d974f0eb54cbac7f498e0.tar.xz | |
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>
Diffstat (limited to 'Documentation/diff-config.txt')
| -rw-r--r-- | 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 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.<driver>.command:: The custom diff driver command. See linkgit:gitattributes[5] for details. @@ -88,3 +82,11 @@ diff.<driver>.wordregex:: diff.<driver>.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.<tool>.cmd` + option. |