Skip to content

Commit

Permalink
Documentation: Allow custom diff tools to be specified in 'diff.tool'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ramkumar Ramachandra authored and Junio C Hamano committed Apr 6, 2011
1 parent 90b94c2 commit 48672b3
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions Documentation/diff-config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.

0 comments on commit 48672b3

Please sign in to comment.