summaryrefslogtreecommitdiffstats
path: root/git-cvsimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-01-16 00:23:23 -0800
committerJunio C Hamano <junio@hera.kernel.org>2006-01-16 00:23:23 -0800
commit02d6fa5ce12d061b1c86f1b76d7bdac8c57e6f0c (patch)
tree970c67d81dde3af013e78e760c3e8c348426910c /git-cvsimport.txt
parent38064d53dc73697ccaf6b40a499ac535621354c7 (diff)
downloadgit-htmldocs-02d6fa5ce12d061b1c86f1b76d7bdac8c57e6f0c.tar.gz
Autogenerated HTML docs for v1.1.2-g4230
Diffstat (limited to 'git-cvsimport.txt')
-rw-r--r--git-cvsimport.txt20
1 files changed, 20 insertions, 0 deletions
diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index 01ca7ef96..dfe86ceea 100644
--- a/git-cvsimport.txt
+++ b/git-cvsimport.txt
@@ -89,6 +89,26 @@ If you need to pass multiple options, separate them with a comma.
-s <subst>::
Substitute the character "/" in branch names with <subst>
+-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
+
+ exon=Andreas Ericsson <ae@op5.se>
+ spawn=Simon Pawn <spawn@frog-pond.org>
+
+ 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
+ git-link[1]::git-cvsexportcommit.
+
OUTPUT
------
If '-v' is specified, the script reports what it is doing.