diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-17 20:09:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-17 20:09:56 (GMT) |
| commit | 8963bb0c2d023738f8ea021b512ed83cd79ee754 (patch) | |
| tree | fbf8f5e69b46d4a01a9b26c0b2434c4be3de5d4d /builtin/shortlog.c | |
| parent | 28dbabb5e04d0d2bc714c46f24dfbf102089c15b (diff) | |
| parent | 5f0df44cd79a953c287ccb598896ea7aaa2cc9e3 (diff) | |
| download | git-8963bb0c2d023738f8ea021b512ed83cd79ee754.zip git-8963bb0c2d023738f8ea021b512ed83cd79ee754.tar.gz git-8963bb0c2d023738f8ea021b512ed83cd79ee754.tar.bz2 | |
Merge branch 'rs/parse-opt-lithelp'
The parse-options machinery learned to refrain from enclosing
placeholder string inside a "<bra" and "ket>" pair automatically
without PARSE_OPT_LITERAL_ARGHELP. Existing help text for option
arguments that are not formatted correctly have been identified and
fixed.
* rs/parse-opt-lithelp:
parse-options: automatically infer PARSE_OPT_LITERAL_ARGHELP
shortlog: correct option help for -w
send-pack: specify --force-with-lease argument help explicitly
pack-objects: specify --index-version argument help explicitly
difftool: remove angular brackets from argument help
add, update-index: fix --chmod argument help
push: use PARSE_OPT_LITERAL_ARGHELP instead of unbalanced brackets
Diffstat (limited to 'builtin/shortlog.c')
| -rw-r--r-- | builtin/shortlog.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/shortlog.c b/builtin/shortlog.c index 608d6ba..3898a2c 100644 --- a/builtin/shortlog.c +++ b/builtin/shortlog.c @@ -268,8 +268,9 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix) N_("Suppress commit descriptions, only provides commit count")), OPT_BOOL('e', "email", &log.email, N_("Show the email address of each author")), - { OPTION_CALLBACK, 'w', NULL, &log, N_("w[,i1[,i2]]"), - N_("Linewrap output"), PARSE_OPT_OPTARG, &parse_wrap_args }, + { OPTION_CALLBACK, 'w', NULL, &log, N_("<w>[,<i1>[,<i2>]]"), + N_("Linewrap output"), PARSE_OPT_OPTARG, + &parse_wrap_args }, OPT_END(), }; |