From: "René Scharfe" <l.s.r@web.de>
To: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, git@vger.kernel.org
Subject: [PATCH 2/6] difftool: remove angular brackets from argument help
Date: Thu, 2 Aug 2018 21:17:43 +0200 [thread overview]
Message-ID: <b6993beb-f9cc-225f-41e8-5a13b9e7ea58@web.de> (raw)
In-Reply-To: <ad2d8f99-07a3-0191-88a2-c43081657988@web.de>
Parseopt wraps arguments in a pair of angular brackets by default,
signifying that the user needs to replace it with a value of the
documented type. Remove the pairs from the option definitions to
duplication and confusion.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
builtin/difftool.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/difftool.c b/builtin/difftool.c
index 51f6c9cdb4..172af0448b 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -703,7 +703,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
1, PARSE_OPT_NONEG | PARSE_OPT_HIDDEN),
OPT_BOOL(0, "symlinks", &symlinks,
N_("use symlinks in dir-diff mode")),
- OPT_STRING('t', "tool", &difftool_cmd, N_("<tool>"),
+ OPT_STRING('t', "tool", &difftool_cmd, N_("tool"),
N_("use the specified diff tool")),
OPT_BOOL(0, "tool-help", &tool_help,
N_("print a list of diff tools that may be used with "
@@ -711,7 +711,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
OPT_BOOL(0, "trust-exit-code", &trust_exit_code,
N_("make 'git-difftool' exit when an invoked diff "
"tool returns a non - zero exit code")),
- OPT_STRING('x', "extcmd", &extcmd, N_("<command>"),
+ OPT_STRING('x', "extcmd", &extcmd, N_("command"),
N_("specify a custom command for viewing diffs")),
OPT_END()
};
--
2.18.0
next prev parent reply other threads:[~2018-08-02 19:17 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-01 18:43 [PATCH] push: comment on a funny unbalanced option help Junio C Hamano
2018-08-01 20:46 ` Ævar Arnfjörð Bjarmason
2018-08-01 21:48 ` Junio C Hamano
2018-08-01 22:31 ` Ævar Arnfjörð Bjarmason
2018-08-02 12:16 ` René Scharfe
2018-08-02 14:21 ` Ævar Arnfjörð Bjarmason
2018-08-02 15:06 ` René Scharfe
2018-08-02 15:16 ` René Scharfe
2018-08-02 15:24 ` Junio C Hamano
2018-08-02 15:31 ` Junio C Hamano
2018-08-02 16:50 ` René Scharfe
2018-08-02 16:54 ` Jeff King
2018-08-02 18:46 ` René Scharfe
2018-08-02 19:17 ` [PATCH 1/6] add, update-index: fix --chmod argument help René Scharfe
2018-08-02 20:41 ` Ævar Arnfjörð Bjarmason
2018-08-02 20:59 ` Ramsay Jones
2018-08-02 21:17 ` Junio C Hamano
2018-08-02 21:04 ` Andrei Rybak
2018-08-02 21:16 ` Junio C Hamano
2018-08-02 19:17 ` René Scharfe [this message]
2018-08-02 19:17 ` [PATCH 3/6] pack-objects: specify --index-version argument help explicitly René Scharfe
2018-08-02 19:17 ` [PATCH 4/6] send-pack: specify --force-with-lease " René Scharfe
2018-08-02 19:18 ` [PATCH 5/6] shortlog: correct option help for -w René Scharfe
2018-08-02 19:18 ` [PATCH 6/6] parse-options: automatically infer PARSE_OPT_LITERAL_ARGHELP René Scharfe
2018-08-02 20:05 ` Junio C Hamano
2018-08-03 8:13 ` Kerry, Richard
2018-08-03 10:39 ` Kerry, Richard
2018-08-02 20:01 ` [PATCH] push: comment on a funny unbalanced option help Junio C Hamano
2018-08-02 22:38 ` René Scharfe
2018-08-03 15:29 ` Junio C Hamano
2018-08-02 15:44 ` Re* " Junio C Hamano
2018-08-02 15:59 ` René Scharfe
2018-08-02 16:23 ` Junio C Hamano
2018-08-02 20:33 ` Ævar Arnfjörð Bjarmason
2018-08-02 20:36 ` Junio C Hamano
2018-08-03 4:42 ` René Scharfe
2018-08-03 15:30 ` Junio C Hamano
2018-08-01 22:57 ` Jonathan Nieder
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=b6993beb-f9cc-225f-41e8-5a13b9e7ea58@web.de \
--to=l.s.r@web.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).