From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Sep 2016 23:09:22 +0000 (-0700)
Subject: Merge branch 'jk/doc-cvs-update'
X-Git-Tag: v2.11.0-rc0~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd250ab5ce7d272a707f4d8d0b05d1db3516cf76;p=thirdparty%2Fgit.git

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

bd250ab5ce7d272a707f4d8d0b05d1db3516cf76