Autogenerated man pages for v1.4.4.4-g4083

diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1
index 89ed19ec3e48574fe5d788de9eeab0125aa3858b..604b02dd8f6c711ba711818b92689dc9c70efd00 100644 (file)
--- a/man1/git-cvsimport.1
+++ b/man1/git-cvsimport.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CVSIMPORT" "1" "10/03/2006" "" ""
+.TH "GIT\-CVSIMPORT" "1" "01/08/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -18,11 +18,10 @@ git\-cvsimport \- Import a CVS repository into git
 .fi
 .SH "DESCRIPTION"
 Imports a CVS repository into git. It will either create a new repository, or incrementally import into an existing one.
-.sp
+
 Splitting the CVS log into patch sets is done by \fIcvsps\fR. At least version 2.1 is required.
-.sp
+
 You should \fBnever\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.
-.sp
 .SH "OPTIONS"
 .TP
 \-d <CVSROOT>
@@ -41,25 +40,13 @@ Kill keywords: will extract files with \-kk from the CVS archive to avoid noisy
 Convert underscores in tag and branch names to dots.
 .TP
 \-o <branch\-for\-HEAD>
-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.
-.sp
-Use
-\fI\-o master\fR
-for continuing an import that was initially done by the old cvs2git tool.
+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 \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
-\fI\-u\fR
-and
-\fI\-A\fR
-are implicit and should not be used here.
-.sp
+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.
 .TP
 \-P <cvsps\-output\-file>
@@ -72,9 +59,7 @@ Attempt to detect merges based on the commit message. This option will enable de
 Attempt to detect merges based on the commit message with a custom regex. It can be used with \-m to also see the default regexes. You must escape forward slashes.
 .TP
 \-v
-Verbosity: let
-\fIcvsimport\fR
-report what it is doing.
+Verbosity: let \fIcvsimport\fR report what it is doing.
 .TP
 <CVS_module>
 The CVS module you want to import. Relative to <CVSROOT>.
@@ -83,35 +68,42 @@ The CVS module you want to import. Relative to <CVSROOT>.
 Print a short usage message and exit.
 .TP
 \-z <fuzz>
-Pass the timestamp fuzz factor to cvsps.
+Pass the timestamp fuzz factor to cvsps, in seconds. If unset, cvsps defaults to 300s.
 .TP
 \-s <subst>
 Substitute the character "/" in branch names with <subst>
 .TP
 \-A <author\-conv\-file>
 CVS by default uses the unix username when writing its commit logs. Using this option and an author\-conv\-file in this format
+.TP
+\-a
+Import all commits, including recent ones. cvsimport by default skips commits that have a timestamp less than 10 minutes ago.
+.TP
+\-S <regex>
+Skip paths matching the regex.
+.TP
+\-L <limit>
+Limit the number of commits imported. Workaround for cases where cvsimport leaks memory.
+
++
 .sp
 .nf
         exon=Andreas Ericsson <ae@op5.se>
         spawn=Simon Pawn <spawn@frog\-pond.org>
 .fi
-git\-cvsimport will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along.
-.sp
-For convenience, this data is saved to $GIT_DIR/cvs\-authors each time the \-A option is provided and read from that same file each time git\-cvsimport is run.
-.sp
-It is not recommended to use this feature if you intend to export changes back to CVS again later with
-\fBgit\-cvsexportcommit\fR(1).
++ git\-cvsimport will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along.
+
++ For convenience, this data is saved to $GIT_DIR/cvs\-authors each time the \-A option is provided and read from that same file each time git\-cvsimport is run.
+
++ It is not recommended to use this feature if you intend to export changes back to CVS again later with \fBgit\-cvsexportcommit\fR(1).
 .SH "OUTPUT"
 If \fI\-v\fR is specified, the script reports what it is doing.
-.sp
+
 Otherwise, success is indicated the Unix way, i.e. by simply exiting with a zero exit status.
-.sp
 .SH "AUTHOR"
 Written by Matthias Urlichs <smurf@smurf.noris.de>, with help from various participants of the git\-list <git@vger.kernel.org>.
-.sp
 .SH "DOCUMENTATION"
 Documentation by Matthias Urlichs <smurf@smurf.noris.de>.
-.sp
 .SH "GIT"
 Part of the \fBgit\fR(7) suite
-.sp
+