summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-29 17:52:34 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-29 17:52:34 -0800
commit106e3afa6f2d54ea520f9f156abca34913ae4968 (patch)
tree48b6736355bec098113081c84ccdbe7720efd716
parent5eee142c89ee4964c9ea4ae1b2fa8344036a7efb (diff)
parentccdd3da6527ca7d8d731e691b9ff0f9b8657298e (diff)
downloadgit-106e3afa6f2d54ea520f9f156abca34913ae4968.tar.gz
Merge branch 'jl/clone-recurse-sm-synonym'
* jl/clone-recurse-sm-synonym: clone: Add the --recurse-submodules option as alias for --recursive
-rw-r--r--Documentation/git-clone.txt4
-rw-r--r--builtin/clone.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 23203829cf..42e7021215 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -12,7 +12,8 @@ SYNOPSIS
'git clone' [--template=<template_directory>]
[-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
[-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
- [--depth <depth>] [--recursive] [--] <repository> [<directory>]
+ [--depth <depth>] [--recursive|--recurse-submodules] [--] <repository>
+ [<directory>]
DESCRIPTION
-----------
@@ -167,6 +168,7 @@ objects from the source repository into a pack in the cloned repository.
as patches.
--recursive::
+--recurse-submodules::
After the clone is created, initialize all submodules within,
using their default settings. This is equivalent to running
`git submodule update --init --recursive` immediately after
diff --git a/builtin/clone.c b/builtin/clone.c
index 19ed64041d..61e0989b5a 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -66,6 +66,8 @@ 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,
+ "initialize submodules in the clone"),
OPT_STRING(0, "template", &option_template, "path",
"path the template repository"),
OPT_STRING(0, "reference", &option_reference, "repo",