Merge branch 'jk/doc-cvs-update'
commitbd250ab5ce7d272a707f4d8d0b05d1db3516cf76
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Sep 2016 23:09:22 +0000 (26 16:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Sep 2016 23:09:22 +0000 (26 16:09 -0700)
tree65a1b8dd654489b58fef7368fb06c845514b54e0
parent104a93a329fdb5ea530cee4012a3023346f2a849
parent106b672adee17391e80c34913c8383e6b426b466
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
Documentation/git-cvsimport.txt