Merge branch 'maint-1.6.1' into maint

diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt
index 2737d10aad1f0663eafe3ef3235be71a86c9f709..aaa7ef737a4c190c60e37e2849ce42f3bdb5dda7 100644 (file)
--- a/Documentation/gitcvs-migration.txt
+++ b/Documentation/gitcvs-migration.txt
@@ -46,7 +46,7 @@ them first before running git pull.
 
 [NOTE]
 ================================
-The `pull` command knows where to get updates from because of certain
+The 'pull' command knows where to get updates from because of certain
 configuration variables that were set by the first 'git-clone'
 command; see `git config -l` and the linkgit:git-config[1] man
 page for details.
@@ -67,7 +67,7 @@ push again.
 In the 'git-push' command above we specify the name of the remote branch
 to update (`master`).  If we leave that out, 'git-push' tries to update
 any branches in the remote repository that have the same name as a branch
-in the local repository.  So the last `push` can be done with either of:
+in the local repository.  So the last 'push' can be done with either of:
 
 ------------
 $ git push origin
@@ -143,6 +143,11 @@ work, you must not modify the imported branches; instead, create new
 branches for your own changes, and merge in the imported branches as
 necessary.
 
+If you want a shared repository, you will need to make a bare clone
+of the imported directory, as described above. Then treat the imported
+directory as another development clone for purposes of merging
+incremental imports.
+
 Advanced Shared Repository Management
 -------------------------------------