From: Junio C Hamano <junio@hera.kernel.org>
Date: Wed, 8 Mar 2006 01:42:50 +0000 (+0000)
Subject: Autogenerated man pages for v1.2.4-gf067
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e75f2e752239751f41c8cb6aaa926a4f034a223b;p=git.git

Autogenerated man pages for v1.2.4-gf067
---

diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1
index 57d4a1d3..204702eb 100755
--- a/man1/git-cvsimport.1
+++ b/man1/git-cvsimport.1
@@ -23,7 +23,7 @@ git-cvsimport \- Import a CVS repository into git
 .SH "SYNOPSIS"
 
 .nf
-git\-cvsimport [\-o <branch\-for\-HEAD>] [\-h] [\-v] [\-d <CVSROOT>] [\-s <subst>]
+\fIgit\-cvsimport\fR [\-o <branch\-for\-HEAD>] [\-h] [\-v] [\-d <CVSROOT>] [\-s <subst>]
               [\-p <options\-for\-cvsps>] [\-C <git_repository>] [\-i] [\-P <file>]
               [\-m] [\-M regex] [<CVS_module>]
 .fi
@@ -34,7 +34,10 @@ git\-cvsimport [\-o <branch\-for\-HEAD>] [\-h] [\-v] [\-d <CVSROOT>] [\-s <subst
 Imports a CVS repository into git\&. It will either create a new repository, or incrementally import into an existing one\&.
 
 
-Splitting the CVS log into patch sets is done by cvsps\&. At least version 2\&.1 is required\&.
+Splitting the CVS log into patch sets is done by \fIcvsps\fR\&. At least version 2\&.1 is required\&.
+
+
+You should \fInever\fR do any work of your own on the branches that are created by git\-cvsimport\&. The initial import will create and populate a "master" branch from the CVS repository's main branch which you're free to work with; after that, you need to \fIgit merge\fR incremental imports, or any CVS branches, yourself\&.
 
 .SH "OPTIONS"
 
@@ -60,13 +63,13 @@ Convert underscores in tag and branch names to dots\&.
 
 .TP
 \-o <branch\-for\-HEAD>
-The HEAD branch from CVS is imported to the origin branch within the git repository, as HEAD already has a special meaning for git\&. Use this option if you want to import into a different branch\&.
+The \fIHEAD\fR branch from CVS is imported to the \fIorigin\fR branch within the git repository, as \fIHEAD\fR already has a special meaning for git\&. Use this option if you want to import into a different branch\&.
 
-Use \-o master for continuing an import that was initially done by the old cvs2git tool\&.
+Use \fI\-o master\fR for continuing an import that was initially done by the old cvs2git tool\&.
 
 .TP
 \-p <options\-for\-cvsps>
-Additional options for cvsps\&. The options \-u and \-A are implicit and should not be used here\&.
+Additional options for cvsps\&. The options \fI\-u\fR and \fI\-A\fR are implicit and should not be used here\&.
 
 If you need to pass multiple options, separate them with a comma\&.
 
@@ -84,7 +87,7 @@ Attempt to detect merges based on the commit message with a custom regex\&. It c
 
 .TP
 \-v
-Verbosity: let cvsimport report what it is doing\&.
+Verbosity: let \fIcvsimport\fR report what it is doing\&.
 
 .TP
 <CVS_module>
@@ -132,7 +135,7 @@ git\-link[1]::git\-cvsexportcommit\&.
 .SH "OUTPUT"
 
 
-If \-v is specified, the script reports what it is doing\&.
+If \fI\-v\fR 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\&.