From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Sebastian Schuberth <sschuberth@gmail.com>, git@vger.kernel.org
Subject: [PATCH] mergetool,difftool: Simplify --tool-help documentation
Date: Fri, 10 Aug 2012 00:39:23 -0700 [thread overview]
Message-ID: <1344584363-5933-2-git-send-email-davvid@gmail.com> (raw)
In-Reply-To: <1344584363-5933-1-git-send-email-davvid@gmail.com>
Remove the entry for --tool-help in the documentation as it is
already mentioned in the documentation for --tool.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
Incompatible with the previous patch, but if you prefer to
mention --tool-help in the docs for --tool only, then choose
this one.
Documentation/git-difftool.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 313d54e..ee80b00 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -74,9 +74,6 @@ with custom merge tool commands and has the same value as `$MERGED`.
Specifying `--no-symlinks` instructs 'git difftool' to create
copies instead. `--no-symlinks` is the default on Windows.
---tool-help::
- Print a list of diff tools that may be used with `--tool`.
-
-x <command>::
--extcmd=<command>::
Specify a custom command for viewing diffs.
--
1.7.12.rc2.16.g034161a
prev parent reply other threads:[~2012-08-10 7:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-10 7:39 [PATCH v2] mergetool,difftool: Document --tool-help consistently David Aguilar
2012-08-10 7:39 ` David Aguilar [this message]
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=1344584363-5933-2-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sschuberth@gmail.com \
/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).