summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Thielow <ralf.thielow@gmail.com>2014-11-18 17:57:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-11-18 19:19:16 (GMT)
commiteedc4be54f41c49000b628a48c4926451986f121 (patch)
treea376be7f22a07b94849ffeac580c09ea429d77c6
parenteeff891ac756fd97a05476446f15269b714ce4cc (diff)
downloadgit-eedc4be54f41c49000b628a48c4926451986f121.zip
git-eedc4be54f41c49000b628a48c4926451986f121.tar.gz
git-eedc4be54f41c49000b628a48c4926451986f121.tar.bz2
builtin/push.c: fix description of --recurse-submodules option
The description of the option for argument "recurse-submodules" is marked for translation even if it expects the untranslated string and it's missing the option "on-demand" which was introduced in eb21c73 (2014-03-29, push: teach --recurse-submodules the on-demand option). Fix this by unmark the string for translation and add the missing option. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/push.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/push.c b/builtin/push.c
index 7b1b66c..17fc31d 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -463,7 +463,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
0, CAS_OPT_NAME, &cas, N_("refname>:<expect"),
N_("require old value of ref to be at this value"),
PARSE_OPT_OPTARG, parseopt_push_cas_option },
- { OPTION_CALLBACK, 0, "recurse-submodules", &flags, N_("check"),
+ { OPTION_CALLBACK, 0, "recurse-submodules", &flags, "check|on-demand",
N_("control recursive pushing of submodules"),
PARSE_OPT_OPTARG, option_parse_recurse_submodules },
OPT_BOOL( 0 , "thin", &thin, N_("use thin pack")),