Merge branch 'rs/parse-opt-lithelp'
commit8963bb0c2d023738f8ea021b512ed83cd79ee754
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:56 +0000 (17 13:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:56 +0000 (17 13:09 -0700)
treefbf8f5e69b46d4a01a9b26c0b2434c4be3de5d4d
parent28dbabb5e04d0d2bc714c46f24dfbf102089c15b
parent5f0df44cd79a953c287ccb598896ea7aaa2cc9e3
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
builtin/add.c
builtin/difftool.c
builtin/pack-objects.c
builtin/push.c
builtin/read-tree.c
builtin/send-pack.c
builtin/shortlog.c
builtin/show-branch.c
builtin/update-index.c
builtin/write-tree.c
parse-options.c