From: David Aguilar <davvid@gmail.com>
To: Stefan Saasen <ssaasen@atlassian.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] mergetool--lib: Fix typo in the merge/difftool help
Date: Fri, 4 Oct 2013 18:49:11 -0700 [thread overview]
Message-ID: <CAJDDKr5wcD2sDUC-jDUmJm8coUPVSHHEK3CGJbKNZ7NoSKBA4A@mail.gmail.com> (raw)
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
prev parent reply other threads:[~2013-10-05 1:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-04 14:34 [PATCH] mergetool--lib: Fix typo in the merge/difftool help Stefan Saasen
2013-10-05 1:49 ` David Aguilar [this message]
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=CAJDDKr5wcD2sDUC-jDUmJm8coUPVSHHEK3CGJbKNZ7NoSKBA4A@mail.gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=ssaasen@atlassian.com \
/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;
as well as URLs for NNTP newsgroup(s).