git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sebastian Schuberth <sschuberth@gmail.com>
To: git@vger.kernel.org
Cc: David Aguilar <davvid@gmail.com>
Subject: [PATCH 3/5] Explicitly list all valid diff tools and document --tool-help as an option
Date: Mon, 23 Jul 2012 09:18:57 +0200	[thread overview]
Message-ID: <500CFAE1.3070304@gmail.com> (raw)
In-Reply-To: <500CF9D2.30102@gmail.com>

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
 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

  parent reply	other threads:[~2012-07-23  7:40 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-23  7:10 [PATCH 0/4] Various merge / diff tool related minor clean-ups and improvements Sebastian Schuberth
2012-07-23  7:14 ` [PATCH v2 0/5] " Sebastian Schuberth
2012-07-23  7:17   ` [PATCH v2 1/5] Sort the list of tools that support both merging and diffing alphabetically Sebastian Schuberth
2012-07-23  7:18   ` [PATCH v2 2/5] Use variables for the lists of tools that support merging / diffing Sebastian Schuberth
2012-07-23 16:46     ` Junio C Hamano
2012-07-23 18:30       ` Sebastian Schuberth
2012-07-23 18:32         ` [PATCH 1/4] " Sebastian Schuberth
2012-07-23 18:37         ` [PATCH v2 2/5] " Junio C Hamano
2012-07-23 19:03           ` Sebastian Schuberth
2012-07-23  7:18   ` Sebastian Schuberth [this message]
2012-07-23 16:48     ` [PATCH 3/5] Explicitly list all valid diff tools and document --tool-help as an option Junio C Hamano
2012-07-23 17:21       ` mergetool: support --tool-help option like difftool does Junio C Hamano
2012-07-23 18:56         ` Sebastian Schuberth
2012-07-23 18:58           ` [PATCH] " Sebastian Schuberth
2012-07-23 19:52             ` Junio C Hamano
2012-07-23 20:14               ` Sebastian Schuberth
2012-07-23 20:44                 ` David Aguilar
2012-07-23 21:16                   ` Junio C Hamano
2012-07-23 21:27                     ` Sebastian Schuberth
2012-07-23 22:31                       ` Junio C Hamano
2012-08-23  5:33         ` Re*: " Junio C Hamano
2012-08-23  7:39           ` David Aguilar
2012-08-23 17:39             ` Junio C Hamano
2012-08-24  8:31               ` David Aguilar
2012-08-26 18:38                 ` Jens Lehmann
2012-07-23  7:19   ` [PATCH v2 4/5] Make sure to use Araxis' "compare" and not e.g. ImageMagick's Sebastian Schuberth
2012-07-23 16:50     ` Junio C Hamano
2012-07-23 19:37       ` [PATCH] " Sebastian Schuberth
2012-07-23 20:47         ` Junio C Hamano
2012-07-23 21:09           ` Sebastian Schuberth
2012-07-23 21:24             ` Junio C Hamano
2012-07-23 21:31               ` Sebastian Schuberth
2012-07-23 21:34               ` David Aguilar
2012-07-23 21:44                 ` Sebastian Schuberth
2012-07-23 21:26             ` Andreas Schwab
2012-07-23 22:22             ` Junio C Hamano
2012-07-23 22:39               ` Sebastian Schuberth
2012-07-23 22:41               ` Junio C Hamano
2012-07-23 23:09                 ` Sebastian Schuberth
2012-07-23  7:20   ` [PATCH v2 5/5] Add a few more code comments and blank lines in guess_merge_tool Sebastian Schuberth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=500CFAE1.3070304@gmail.com \
    --to=sschuberth@gmail.com \
    --cc=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).