aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-cvsimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-05 18:33:16 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-05 18:33:16 -0700
commit08b51f51e6a4cf2f5ad4b893707f1337a450e499 (patch)
tree1ff3a0c83f79c221194ac91ee6c2018d477ec7af /Documentation/git-cvsimport.txt
parent1fc561d169ac08c411e34a4439894c5201b3d080 (diff)
parent9b373229506c9f563b2e2f053c3f1d932789fbfd (diff)
downloadgit-08b51f51e6a4cf2f5ad4b893707f1337a450e499.tar.gz
Merge branch 'qq/maint'
* qq/maint: clone -q: honor "quiet" option over native transports. attribute documentation: keep EXAMPLE at end builtin-commit.c: Use 'git_config_string' to get 'commit.template' http.c: Use 'git_config_string' to clean up SSL config. diff.c: Use 'git_config_string' to get 'diff.external' convert.c: Use 'git_config_string' to get 'smudge' and 'clean' builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix' Documentation cvs: Clarify when a bare repository is needed Documentation: be precise about which date --pretty uses Conflicts: Documentation/gitattributes.txt
Diffstat (limited to 'Documentation/git-cvsimport.txt')
-rw-r--r--Documentation/git-cvsimport.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 1614e8df89..b7a8c10b87 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -31,6 +31,12 @@ to work with; after that, you need to 'git-merge' incremental imports, or
any CVS branches, yourself. It is advisable to specify a named remote via
-r to separate and protect the incoming branches.
+If you intend to set up a shared public repository that all developers can
+read/write, or if you want to use linkgit:git-cvsserver[1], then you
+probably want to make a bare clone of the imported repository,
+and use the clone as the shared repository.
+See linkgit:gitcvs-migration[7].
+
OPTIONS
-------