From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Oct 2016 20:22:25 +0000 (-0700)
Subject: Merge branch 'jk/doc-cvs-update' into maint
X-Git-Tag: v2.10.1~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3d0049ea359c88a6a3615e9f25a9bb613caff5b8;p=git-core%2Fgit.git

Merge branch 'jk/doc-cvs-update' into maint

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

3d0049ea359c88a6a3615e9f25a9bb613caff5b8