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: https://git.lorimer.id.au/gitweb.git/diff_plain/3d0049ea359c88a6a3615e9f25a9bb613caff5b8?ds=inline;hp=-c

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
diff --combined Documentation/git-cvsimport.txt
index 41207a24b0,0d2967a115..de1ebed67d
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@@ -22,7 -22,7 +22,7 @@@ DESCRIPTIO
  deprecated; it does not work with cvsps version 3 and later.  If you are
  performing a one-shot import of a CVS repository consider using
  http://cvs2svn.tigris.org/cvs2git.html[cvs2git] or
- https://github.com/BartMassey/parsecvs[parsecvs].
+ http://www.catb.org/esr/cvs-fast-export/[cvs-fast-export].
  
  Imports a CVS repository into Git. It will either create a new
  repository, or incrementally import into an existing one.
@@@ -74,10 -74,10 +74,10 @@@ OPTION
  	akin to the way 'git clone' uses 'origin' by default.
  
  -o <branch-for-HEAD>::
 -	When no remote is specified (via -r) the 'HEAD' branch
 +	When no remote is specified (via -r) the `HEAD` branch
  	from CVS is imported to the 'origin' branch within the Git
 -	repository, as 'HEAD' already has a special meaning for Git.
 -	When a remote is specified the 'HEAD' branch is named
 +	repository, as `HEAD` already has a special meaning for Git.
 +	When a remote is specified the `HEAD` branch is named
  	remotes/<remote>/master mirroring 'git clone' behaviour.
  	Use this option if you want to import into a different
  	branch.
@@@ -103,7 -103,7 +103,7 @@@ the old cvs2git tool
  
  -p <options-for-cvsps>::
  	Additional options for cvsps.
 -	The options '-u' and '-A' are implicit and should not be used here.
 +	The options `-u` and '-A' are implicit and should not be used here.
  +
  If you need to pass multiple options, separate them with a comma.
  
@@@ -122,7 -122,7 +122,7 @@@
  
  -M <regex>::
  	Attempt to detect merges based on the commit message with a custom
 -	regex. It can be used with '-m' to enable the default regexes
 +	regex. It can be used with `-m` to enable the default regexes
  	as well. You must escape forward slashes.
  +
  The regex must capture the source branch name in $1.
@@@ -186,7 -186,7 +186,7 @@@ messages, bug-tracking systems, email a
  
  OUTPUT
  ------
 -If '-v' is specified, the script reports what it is doing.
 +If `-v` is specified, the script reports what it is doing.
  
  Otherwise, success is indicated the Unix way, i.e. by simply exiting with
  a zero exit status.