Git development
 help / color / mirror / Atom feed
From: Thomas Hochstein <thh@inter.net>
To: git@vger.kernel.org
Cc: Thomas Hochstein <thh@inter.net>
Subject: [PATCH] documentation fix: git difftool uses diff tools, not merge tools.
Date: Mon, 14 Nov 2011 23:55:52 +0100	[thread overview]
Message-ID: <1321311352-8950-1-git-send-email-thh@inter.net> (raw)

Let the documentation for -t list valid *diff* tools,
not valid *merge* tools.

Signed-off-by: Thomas Hochstein <thh@inter.net>
---
 Documentation/git-difftool.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index a03515f..19d473c 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -31,7 +31,7 @@ OPTIONS
 -t <tool>::
 --tool=<tool>::
 	Use the diff tool specified by <tool>.
-	Valid merge tools are:
+	Valid diff tools are:
 	araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
 	kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
 +
-- 
1.7.2.5

             reply	other threads:[~2011-11-14 23:07 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-14 22:55 Thomas Hochstein [this message]
2011-11-15  0:20 ` [PATCH] documentation fix: git difftool uses diff tools, not merge tools Junio C Hamano
2011-11-21 12:25   ` David Aguilar

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=1321311352-8950-1-git-send-email-thh@inter.net \
    --to=thh@inter.net \
    --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