summaryrefslogtreecommitdiffstats
path: root/git-cvsimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-03-21 08:33:47 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-03-21 08:33:47 +0000
commita725a53a1bd7c9e733b42b9a8707f4255a3e4654 (patch)
treedae9fd24f68fa7eaaa10780ac37d796f38353c10 /git-cvsimport.txt
parent2b13527e6477916ed5cb6f1858d9d0e5381d236d (diff)
downloadgit-htmldocs-a725a53a1bd7c9e733b42b9a8707f4255a3e4654.tar.gz
Autogenerated HTML docs for v1.2.4-gac74
Diffstat (limited to 'git-cvsimport.txt')
-rw-r--r--git-cvsimport.txt27
1 files changed, 15 insertions, 12 deletions
diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index 57027b448..b0c6d7c30 100644
--- a/git-cvsimport.txt
+++ b/git-cvsimport.txt
@@ -99,21 +99,24 @@ If you need to pass multiple options, separate them with a comma.
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.
+---------
++
+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
------