diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-11 16:01:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-11 16:01:47 -0800 |
| commit | 00e6ee724640701b32aca27cc930fd6409c87ae2 (patch) | |
| tree | 499d7982303f5f9cb9d7ef0f65418adacb1fe31c /builtin | |
| parent | b308bf18633964102472db5065929a359d4ad265 (diff) | |
| parent | 9971d6d52c5afeb8ba60ae6ddcffb34af23eeadd (diff) | |
| download | git-00e6ee724640701b32aca27cc930fd6409c87ae2.tar.gz | |
Merge branch 'maint'
* maint:
Git 1.7.4.1
clone: fixup recurse_submodules option
svn-fe: warn about experimental status
Conflicts:
contrib/examples/git-revert.sh
contrib/svn-fe/svn-fe.txt
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 61e0989b5a..82a6938620 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -66,7 +66,7 @@ static struct option builtin_clone_options[] = { "setup as shared repository"), OPT_BOOLEAN(0, "recursive", &option_recursive, "initialize submodules in the clone"), - OPT_BOOLEAN(0, "recurse_submodules", &option_recursive, + OPT_BOOLEAN(0, "recurse-submodules", &option_recursive, "initialize submodules in the clone"), OPT_STRING(0, "template", &option_template, "path", "path the template repository"), |