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

diff --cc builtin/add.c
Simple merge

diff --cc builtin/difftool.c
index 3018e61d048dacd178200ce380e319ae302b5790,91dbef8f493da3e13489a8ae3bb916c9a93b59a7..cdd585ca76d51f6d5dcca78a9e1dfa6f8102c476
--- 1/builtin/difftool.c
--- 2/builtin/difftool.c
+++ b/builtin/difftool.c
@@@ -696,14 -695,15 +696,14 @@@ int cmd_difftool(int argc, const char *
                         N_("use `diff.guitool` instead of `diff.tool`")),
                OPT_BOOL('d', "dir-diff", &dir_diff,
                         N_("perform a full-directory diff")),
 -              { OPTION_SET_INT, 'y', "no-prompt", &prompt, NULL,
 +              OPT_SET_INT_F('y', "no-prompt", &prompt,
                        N_("do not prompt before launching a diff tool"),
 -                      PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 0},
 -              { OPTION_SET_INT, 0, "prompt", &prompt, NULL, NULL,
 -                      PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_HIDDEN,
 -                      NULL, 1 },
 +                      0, PARSE_OPT_NONEG),
 +              OPT_SET_INT_F(0, "prompt", &prompt, NULL,
 +                      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 "

diff --cc builtin/pack-objects.c
Simple merge

diff --cc builtin/push.c
Simple merge

diff --cc builtin/read-tree.c
Simple merge

diff --cc builtin/send-pack.c
Simple merge

diff --cc builtin/shortlog.c
Simple merge

diff --cc builtin/show-branch.c
Simple merge

diff --cc builtin/update-index.c
Simple merge

diff --cc builtin/write-tree.c
Simple merge

diff --cc parse-options.c
Simple merge