[PATCH 3/5] Explicitly list all valid diff tools and document --tool-help as an option
From: Sebastian Schuberth <hidden>
Date: 2016-06-15 22:54:18
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Signed-off-by: Sebastian Schuberth <redacted> --- Documentation/git-difftool.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 31fc2e3..5dd54f1 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt@@ -36,9 +36,12 @@ OPTIONS -t <tool>:: --tool=<tool>:: - Use the diff tool specified by <tool>. Valid values include - emerge, kompare, meld, and vimdiff. Run `git difftool --tool-help` - for the list of valid <tool> settings. + Use the diff tool specified by <tool>. Valid diff tools are: + araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kcompare, kdiff3, + meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff. + +--tool-help:: + List the supported and available diff tools. + If a diff tool is not specified, 'git difftool' will use the configuration variable `diff.tool`. If the
--
1.7.11.msysgit.2