From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Nov 2010 01:52:34 +0000 (-0800)
Subject: Merge branch 'jl/clone-recurse-sm-synonym'
X-Git-Tag: v1.7.4-rc0~102
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/106e3afa6f2d54ea520f9f156abca34913ae4968?ds=inline;hp=-c

Merge branch 'jl/clone-recurse-sm-synonym'

* jl/clone-recurse-sm-synonym:
clone: Add the --recurse-submodules option as alias for --recursive
---

106e3afa6f2d54ea520f9f156abca34913ae4968
diff --combined Documentation/git-clone.txt
index 23203829cf,d69984b27c..42e7021215
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@@ -12,7 -12,8 +12,8 @@@ SYNOPSI
  '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
  -----------
@@@ -131,7 -132,7 +132,7 @@@ objects from the source repository int
  	Set up a mirror of the source repository.  This implies `--bare`.
  	Compared to `--bare`, `--mirror` not only maps local branches of the
  	source to local branches of the target, it maps all refs (including
 -	remote branches, notes etc.) and sets up a refspec configuration such
 +	remote-tracking branches, notes etc.) and sets up a refspec configuration such
  	that all these refs are overwritten by a `git remote update` in the
  	target repository.
  
@@@ -167,6 -168,7 +168,7 @@@
  	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