Imports a CVS repository into git\&. It will either create a new repository, or incrementally import into an existing one\&.
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"
.SH "OPTIONS"
@@ -60,13+63,13 @@ Convert underscores in tag and branch names to dots\&.
.TP
\-o <branch\-for\-HEAD>
.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>
.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\&.
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
.TP
\-v
-Verbosity: let cvsimport report what it is doing\&.
+Verbosity: let \fIcvsimport\fR report what it is doing\&.