summaryrefslogtreecommitdiff
path: root/builtin/add.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-17 20:09:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-17 20:09:56 (GMT)
commit8963bb0c2d023738f8ea021b512ed83cd79ee754 (patch)
treefbf8f5e69b46d4a01a9b26c0b2434c4be3de5d4d /builtin/add.c
parent28dbabb5e04d0d2bc714c46f24dfbf102089c15b (diff)
parent5f0df44cd79a953c287ccb598896ea7aaa2cc9e3 (diff)
downloadgit-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/add.c')
-rw-r--r--builtin/add.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c
index 8a155dd..ba1ff56 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -304,7 +304,8 @@ static struct option builtin_add_options[] = {
OPT_BOOL( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")),
OPT_BOOL( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")),
OPT_BOOL( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")),
- OPT_STRING( 0 , "chmod", &chmod_arg, N_("(+/-)x"), N_("override the executable bit of the listed files")),
+ OPT_STRING(0, "chmod", &chmod_arg, "(+|-)x",
+ N_("override the executable bit of the listed files")),
OPT_HIDDEN_BOOL(0, "warn-embedded-repo", &warn_on_embedded_repo,
N_("warn when adding an embedded repository")),
OPT_END(),