diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-17 23:09:56 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-17 23:09:56 +0300 |
commit | 8963bb0c2d023738f8ea021b512ed83cd79ee754 (patch) | |
tree | fbf8f5e69b46d4a01a9b26c0b2434c4be3de5d4d /builtin/show-branch.c | |
parent | 28dbabb5e04d0d2bc714c46f24dfbf102089c15b (diff) | |
parent | 5f0df44cd79a953c287ccb598896ea7aaa2cc9e3 (diff) |
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/show-branch.c')
-rw-r--r-- | builtin/show-branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 4b9d3c0059..363cf8509a 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -674,7 +674,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) { OPTION_CALLBACK, 'g', "reflog", &reflog_base, N_("<n>[,<base>]"), N_("show <n> most recent ref-log entries starting at " "base"), - PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, + PARSE_OPT_OPTARG, parse_reflog_param }, OPT_END() }; |