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

[PATCH] mergetool--lib: Fix typo in the merge/difftool help

From
SSStefan Saasen <ssaasen@atlassian.com>
Date
Oct 4, 2013, 14:34 UTC
Message-ID
<1380897293-41652-1-git-send-email-ssaasen@atlassian.com>
The help text for the `tool` flag should mention:
    --tool=<tool>
instead of:
    --tool-<tool>
Signed-off-by: Stefan Saasen <ssaasen@atlassian.com>
---
 git-mergetool--lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index feee6a4..e1c7eb1 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -263,7 +263,7 @@ list_merge_tool_candidates () {
 }
 
 show_tool_help () {
-	tool_opt="'git ${TOOL_MODE}tool --tool-<tool>'"
+	tool_opt="'git ${TOOL_MODE}tool --tool=<tool>'"
 
 	tab='	'
 	LF='
-- 
1.8.4.474.g128a96c.dirty
Next: David Aguilar
Message 1 of 2 in “mergetool--lib: Fix typo in the merge/difftool help”
  1. mergetool--lib: Fix typo in the merge/difftool helpStefan Saasen, Oct 4, 2013
  2. David AguilarOct 5, 2013

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.