summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-12 22:31:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-12 22:31:38 (GMT)
commitbb87344a74119abeb2ca8c7f42f89ccad1ba6e32 (patch)
tree55e3e5203c2c6e5a6cc62a596d2c85b981083b87 /builtin/push.c
parent974df59986008f4fc38b4e3d0f0b9522fee9afd8 (diff)
parenteedc4be54f41c49000b628a48c4926451986f121 (diff)
downloadgit-bb87344a74119abeb2ca8c7f42f89ccad1ba6e32.zip
git-bb87344a74119abeb2ca8c7f42f89ccad1ba6e32.tar.gz
git-bb87344a74119abeb2ca8c7f42f89ccad1ba6e32.tar.bz2
Merge branch 'rt/push-recurse-submodule-usage-string'
* rt/push-recurse-submodule-usage-string: builtin/push.c: fix description of --recurse-submodules option
Diffstat (limited to 'builtin/push.c')
-rw-r--r--builtin/push.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/push.c b/builtin/push.c
index a076b19..cfa20c2 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -503,7 +503,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")),