summaryrefslogtreecommitdiff
path: root/Documentation/git-cvsimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-26 23:09:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-26 23:09:22 (GMT)
commitbd250ab5ce7d272a707f4d8d0b05d1db3516cf76 (patch)
tree65a1b8dd654489b58fef7368fb06c845514b54e0 /Documentation/git-cvsimport.txt
parent104a93a329fdb5ea530cee4012a3023346f2a849 (diff)
parent106b672adee17391e80c34913c8383e6b426b466 (diff)
downloadgit-bd250ab5ce7d272a707f4d8d0b05d1db3516cf76.zip
git-bd250ab5ce7d272a707f4d8d0b05d1db3516cf76.tar.gz
git-bd250ab5ce7d272a707f4d8d0b05d1db3516cf76.tar.bz2
Merge branch 'jk/doc-cvs-update'
Documentation around tools to import from CVS was fairly outdated. * jk/doc-cvs-update: docs/cvs-migration: mention cvsimport caveats docs/cvs-migration: update link to cvsps homepage docs/cvsimport: prefer cvs-fast-export to parsecvs
Diffstat (limited to 'Documentation/git-cvsimport.txt')
-rw-r--r--Documentation/git-cvsimport.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 41207a2..de1ebed 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -22,7 +22,7 @@ DESCRIPTION
deprecated; it does not work with cvsps version 3 and later. If you are
performing a one-shot import of a CVS repository consider using
http://cvs2svn.tigris.org/cvs2git.html[cvs2git] or
-https://github.com/BartMassey/parsecvs[parsecvs].
+http://www.catb.org/esr/cvs-fast-export/[cvs-fast-export].
Imports a CVS repository into Git. It will either create a new
repository, or incrementally import into an existing one.