From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Apr 2009 05:35:57 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.2.2~7^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f054a419419337142ffe40433aa3984ccc000624;hp=-c;p=git.git

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  Documentation: Remove an odd "instead"
---

f054a419419337142ffe40433aa3984ccc000624
diff --combined Documentation/git-clone.txt
index 95f08b911,307f2521b..4072f40d7
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@@ -90,11 -90,6 +90,11 @@@ then the cloned repository will become 
  	Operate quietly.  This flag is also passed to the `rsync'
  	command when given.
  
 +--verbose::
 +-v::
 +	Display the progressbar, even in case the standard output is not
 +	a terminal.
 +
  --no-checkout::
  -n::
  	No checkout of HEAD is performed after the clone is complete.
@@@ -117,7 -112,7 +117,7 @@@
  --origin <name>::
  -o <name>::
  	Instead of using the remote name 'origin' to keep track
- 	of the upstream repository, use <name> instead.
+ 	of the upstream repository, use <name>.
  
  --upload-pack <upload-pack>::
  -u <upload-pack>::