summaryrefslogtreecommitdiff
path: root/builtin/checkout-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-27 21:33:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-27 21:33:43 (GMT)
commitfc0df933c8fa09603a9e9798085ee07ca1a83f65 (patch)
treeeb9d2ad782975bd21f6725e0a30add4a374ccadb /builtin/checkout-index.c
parent6e96e88ae43e8c78ec0066b0ee87d53987b14098 (diff)
parentbbc072f5d884d17a6102fd04ae6d2cfcaa98ad48 (diff)
downloadgit-fc0df933c8fa09603a9e9798085ee07ca1a83f65.zip
git-fc0df933c8fa09603a9e9798085ee07ca1a83f65.tar.gz
git-fc0df933c8fa09603a9e9798085ee07ca1a83f65.tar.bz2
Merge branch 'rs/opt-updates'
"git cmd -h" updates. * rs/opt-updates: parseopt: group literal string alternatives in argument help remote: improve argument help for add --mirror checkout-index: improve argument help for --stage
Diffstat (limited to 'builtin/checkout-index.c')
-rw-r--r--builtin/checkout-index.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index d92db62..88b86c8 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -172,7 +172,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
N_("write the content to temporary files")),
OPT_STRING(0, "prefix", &state.base_dir, N_("string"),
N_("when creating files, prepend <string>")),
- { OPTION_CALLBACK, 0, "stage", NULL, "1-3|all",
+ { OPTION_CALLBACK, 0, "stage", NULL, "(1|2|3|all)",
N_("copy out the files from named stage"),
PARSE_OPT_NONEG, option_parse_stage },
OPT_END()