From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Sep 2009 16:43:08 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.5-rc0~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/79b4fde573eb5e86a8109d100ad182be1eb5fc54?ds=inline;hp=-c

Merge branch 'maint'

* maint:
git-clone: add missing comma in --reference documentation
---

79b4fde573eb5e86a8109d100ad182be1eb5fc54
diff --combined Documentation/git-clone.txt
index 88ea272ee5,1709a2dbd0..2e0785e1de
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@@ -12,7 -12,7 +12,7 @@@ SYNOPSI
  'git clone' [--template=<template_directory>]
  	  [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
  	  [-o <name>] [-u <upload-pack>] [--reference <repository>]
 -	  [--depth <depth>] [--] <repository> [<directory>]
 +	  [--depth <depth>] [--recursive] [--] <repository> [<directory>]
  
  DESCRIPTION
  -----------
@@@ -84,7 -84,7 +84,7 @@@ its source repository, you can simply r
  objects from the source repository into a pack in the cloned repository.
  
  --reference <repository>::
- 	If the reference repository is on the local machine
+ 	If the reference repository is on the local machine,
  	automatically setup .git/objects/info/alternates to
  	obtain objects from the reference repository.  Using
  	an already existing repository as an alternate will
@@@ -147,14 -147,6 +147,14 @@@
  	with a long history, and would want to send in fixes
  	as patches.
  
 +--recursive::
 +	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
 +	the clone is finished. This option is ignored if the cloned
 +	repository does not have a worktree/checkout (i.e. if any of
 +	`--no-checkout`/`-n`, `--bare`, or `--mirror` is given)
 +
  <repository>::
  	The (possibly remote) repository to clone from.  See the
  	<<URLS,URLS>> section below for more information on specifying