summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-04 10:04:22 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-04 10:04:23 -0800
commit3d00a5c148ee5611fc21de6d20f5f82602a75c5f (patch)
tree6231779249bf4f67f20752e7ac52b499d1975d7d /Documentation
parentMerge branch 'dl/am-hg-locale' into maint (diff)
parentgit-cvsimport.txt: cvsps-2 is deprecated (diff)
downloadtgif-3d00a5c148ee5611fc21de6d20f5f82602a75c5f.tar.xz
Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maint
* jk/cvsimport-does-not-work-with-cvsps3: git-cvsimport.txt: cvsps-2 is deprecated
Diffstat (limited to 'Documentation')
-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 9d5353e8be..f059ea94da 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -18,6 +18,12 @@ SYNOPSIS
DESCRIPTION
-----------
+*WARNING:* `git cvsimport` uses cvsps version 2, which is considered
+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
+link:http://cvs2svn.tigris.org/cvs2git.html[cvs2git] or
+link:https://github.com/BartMassey/parsecvs[parsecvs].
+
Imports a CVS repository into git. It will either create a new
repository, or incrementally import into an existing one.