From: Tim Henigan <tim.henigan@gmail.com>
To: git@vger.kernel.org, gitster@pobox.com, davvid@gmail.com
Cc: Tim Henigan <tim.henigan@gmail.com>
Subject: [PATCH] Documentation/difftool: add deltawalker to list of valid diff tools
Date: Thu, 15 Mar 2012 12:28:26 -0400 [thread overview]
Message-ID: <1331828906-5943-1-git-send-email-tim.henigan@gmail.com> (raw)
deltawalker has been supported since 284a126c3ef3, but was not added
to the list of valid diff tools reported by 'git difftool --help'.
Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
---
The list of valid tools seems prone to error. Right now, there is nothing
that tells people to update this documentation when new config files are
added to 'mergetools'. Should I add a README to 'mergetools' with
instructions to update this file? Or would it be better to replace the
list in the help string with a more general statement like "<tool> must
match one of the files located in $(git --exec-path)/mergetools"?
Documentation/git-difftool.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 19d473c..fe38f66 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -32,8 +32,9 @@ OPTIONS
--tool=<tool>::
Use the diff tool specified by <tool>.
Valid diff tools are:
- araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
- kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
+ araxis, bc3, deltawalker, diffuse, emerge, ecmerge, gvimdiff,
+ kdiff3, kompare, meld, opendiff, p4merge, tkdiff, vimdiff and
+ xxdiff.
+
If a diff tool is not specified, 'git difftool'
will use the configuration variable `diff.tool`. If the
--
1.7.10.rc1
next reply other threads:[~2012-03-15 16:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-15 16:28 Tim Henigan [this message]
2012-03-15 20:56 ` [PATCH] Documentation/difftool: add deltawalker to list of valid diff tools Junio C Hamano
2012-03-15 22:16 ` Junio C Hamano
2012-03-15 22:21 ` Tim Henigan
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=1331828906-5943-1-git-send-email-tim.henigan@gmail.com \
--to=tim.henigan@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).