Merge branch 'jk/doc-cvs-update' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:22:25 +0000 (13:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:22:25 +0000 (13:22 -0700)
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

1  2 
Documentation/git-cvsimport.txt
Simple merge