From: David Aguilar <davvid@gmail.com>
Date: Sat, 05 Oct 2013 01:49:11 GMT
Subject: Re: [PATCH] mergetool--lib: Fix typo in the merge/difftool help
Message-ID: <CAJDDKr5wcD2sDUC-jDUmJm8coUPVSHHEK3CGJbKNZ7NoSKBA4A@mail.gmail.com>
In-Reply-To: <1380897293-41652-1-git-send-email-ssaasen@atlassian.com>

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

>  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