* [PATCH] mergetool--lib: Fix typo in the merge/difftool help
@ 2013-10-04 14:34 Stefan Saasen
2013-10-05 1:49 ` David Aguilar
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Saasen @ 2013-10-04 14:34 UTC (permalink / raw)
To: git; +Cc: davvid, Stefan Saasen
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] mergetool--lib: Fix typo in the merge/difftool help
2013-10-04 14:34 [PATCH] mergetool--lib: Fix typo in the merge/difftool help Stefan Saasen
@ 2013-10-05 1:49 ` David Aguilar
0 siblings, 0 replies; 2+ messages in thread
From: David Aguilar @ 2013-10-05 1:49 UTC (permalink / raw)
To: Stefan Saasen; +Cc: Git Mailing List
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-05 1:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).