git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] mergetool,difftool: Simplify --tool-help documentation

From
David Aguilar <davvid@gmail.com>
Date
Aug 10, 2012, 07:39 UTC
Message-ID
<1344584363-5933-2-git-send-email-davvid@gmail.com>
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
Previous: David Aguilar
Message 2 of 2 in “mergetool,difftool: Document --tool-help consistently”
  1. mergetool,difftool: Document --tool-help consistentlyDavid Aguilar, Aug 10, 2012
  2. mergetool,difftool: Simplify --tool-help documentationDavid Aguilar, Aug 10, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.