diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-12 14:31:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-12 14:31:38 -0800 |
| commit | bb87344a74119abeb2ca8c7f42f89ccad1ba6e32 (patch) | |
| tree | 55e3e5203c2c6e5a6cc62a596d2c85b981083b87 | |
| parent | 974df59986008f4fc38b4e3d0f0b9522fee9afd8 (diff) | |
| parent | eedc4be54f41c49000b628a48c4926451986f121 (diff) | |
| download | git-bb87344a74119abeb2ca8c7f42f89ccad1ba6e32.tar.gz | |
Merge branch 'rt/push-recurse-submodule-usage-string'
* rt/push-recurse-submodule-usage-string:
builtin/push.c: fix description of --recurse-submodules option
| -rw-r--r-- | builtin/push.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/push.c b/builtin/push.c index a076b1964d..cfa20c266b 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")), |