Autogenerated man pages for v1.1.2-g4230

[git.git] / man1 / git-cvsimport.1

diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1
index f23e33a..57d4a1d 100755 (executable)
--- a/man1/git-cvsimport.1
+++ b/man1/git-cvsimport.1
@@ -22,8 +22,11 @@
 git-cvsimport \- Import a CVS repository into git
 .SH "SYNOPSIS"
 
-
-git\-cvsimport [ \-o <branch\-for\-HEAD> ] [ \-h ] [ \-v ] [ \-d <CVSROOT> ] [ \-p <options\-for\-cvsps> ] [ \-C <git_repository> ] [ \-i ] [ \-P <file> ] [ \-k ] [ \-s <subst> ] [ \-m ] [ \-M regex ] [ <CVS_module> ]
+.nf
+git\-cvsimport [\-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
 
 .SH "DESCRIPTION"
 
@@ -99,6 +102,33 @@ Pass the timestamp fuzz factor to cvsps\&.
 \-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
+
+.nf
+exon=Andreas Ericsson <ae@op5\&.se>
+spawn=Simon Pawn <spawn@frog\-pond\&.org>
+.fi
+
+.nf
+git\-cvsimport will make it appear as those authors had
+their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
+all along\&.
+.fi
+
+.nf
+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\&.
+.fi
+
+.nf
+It is not recommended to use this feature if you intend to
+export changes back to CVS again later with
+git\-link[1]::git\-cvsexportcommit\&.
+.fi
+
 .SH "OUTPUT"