summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-09-22 03:26:28 -0400
committerJunio C Hamano <gitster@pobox.com>2016-09-22 11:23:45 -0700
commit106b672adee17391e80c34913c8383e6b426b466 (patch)
tree9150f58f63229a46efe54aa6ba0971da91e5f539
parent72e0877a1dab75113792d13abb9d1b9fc4252922 (diff)
downloadgit-jk/doc-cvs-update.tar.gz
docs/cvs-migration: mention cvsimport caveatsjk/doc-cvs-update
Back when this guide was written, cvsimport was the only game in town. These days it is probably not the best option. Rather than go into details, let's point people to the note at the top of cvsimport which gives other options. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/gitcvs-migration.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt
index faee5c21dc..4c6143c511 100644
--- a/Documentation/gitcvs-migration.txt
+++ b/Documentation/gitcvs-migration.txt
@@ -116,6 +116,10 @@ they create are writable and searchable by other group members.
Importing a CVS archive
-----------------------
+NOTE: These instructions use the `git-cvsimport` script which ships with
+git, but other importers may provide better results. See the note in
+linkgit:git-cvsimport[1] for other options.
+
First, install version 2.1 or higher of cvsps from
https://github.com/andreyvit/cvsps[https://github.com/andreyvit/cvsps] and make
sure it is in your path. Then cd to a checked out CVS working directory