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
This commit is contained in:
Junio C Hamano 2013-02-04 10:04:22 -08:00
commit 3d00a5c148

View File

@ -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.