Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 31237259e4c4333641612492b44e334533764aa4..e1fd047bb54ac3f73aed3fa0d39b39eeb13c7821 100644 (file)
--- 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