threads / patch / 35066

patchmergetool--lib: Fix typo in the merge/difftool help

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

## tl;dr

2 messages between Oct 4, 2013 and Oct 5, 2013. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Stefan Saasen· Oct 4, 2013, 14:34 UTC · lore

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(-)

Show changes to git-mergetool--lib.sh +1 −1

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

David Aguilar· Oct 5, 2013, 01:49 UTC · re: Stefan Saasen · lore

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

On Fri, Oct 4, 2013 at 7:34 AM, Stefan Saasen <ssaasen@atlassian.com> wrote:

Show 10 quoted lines

> The help text for the `tool` flag should mention:
>
>     --tool=<tool>
>
> instead of:
>
>     --tool-<tool>
>
> Signed-off-by: Stefan Saasen <ssaasen@atlassian.com>
> ---

Good eyes!

Reviewed-by: David Aguilar <davvid@gmail.com>

Thanks

Show 19 quoted lines

>  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
>

-- 
David