From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Mar 2009 07:29:05 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.3-rc0~78
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eed1fcd76d8893ab687c700e1729faea025ba7a8?hp=f23336f5c15eb90df3275076181d10746479be5b

Merge branch 'maint'

* maint:
documentation: update cvsimport description of "-r" for recent clone
---

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 31237259e4..e1fd047bb5 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -65,7 +65,7 @@ OPTIONS
 -r <remote>::
 	The git remote to import this CVS repository into.
 	Moves all CVS branches into remotes/<remote>/<branch>
-	akin to the 'git-clone' "--use-separate-remote" option.
+	akin to the way 'git-clone' uses 'origin' by default.
 
 -o <branch-for-HEAD>::
 	When no remote is specified (via -r) the 'HEAD' branch