From: Junio C Hamano Date: Mon, 28 Jan 2013 19:09:37 +0000 (-0800) Subject: Merge branch 'er/stop-recommending-parsecvs' into maint X-Git-Tag: v1.8.1.2~8 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3a51e4be9c3910ce0b81de5eb1b7f4a16994fc78?hp=ce956fc48eb6f4a8eb90fd22a7d730e8d012f91f Merge branch 'er/stop-recommending-parsecvs' into maint * er/stop-recommending-parsecvs: Remove the suggestion to use parsecvs, which is currently broken. --- diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index 98d9881d7e..9d5353e8be 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -213,11 +213,9 @@ Problems related to tags: * Multiple tags on the same revision are not imported. If you suspect that any of these issues may apply to the repository you -want to import consider using these alternative tools which proved to be -more stable in practice: +want to imort, consider using cvs2git: -* cvs2git (part of cvs2svn), `http://cvs2svn.tigris.org` -* parsecvs, `http://cgit.freedesktop.org/~keithp/parsecvs` +* cvs2git (part of cvs2svn), `http://subversion.apache.org/` GIT ---