summaryrefslogtreecommitdiff
path: root/builtin/read-tree.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/read-tree.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/read-tree.c')
-rw-r--r--builtin/read-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index ebc43eb..fbbc98e 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -133,7 +133,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
N_("same as -m, but discard unmerged entries")),
{ OPTION_STRING, 0, "prefix", &opts.prefix, N_("<subdirectory>/"),
N_("read the tree into the index under <subdirectory>/"),
- PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP },
+ PARSE_OPT_NONEG },
OPT_BOOL('u', NULL, &opts.update,
N_("update working tree with merge result")),
{ OPTION_CALLBACK, 0, "exclude-per-directory", &opts,