summaryrefslogtreecommitdiffstats
path: root/git-cvsimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-11-12 15:22:57 -0800
committerJunio C Hamano <gitster@pobox.com>2013-11-12 15:22:57 -0800
commite3acfb85c234b3debc7225a9171ab370e24e0324 (patch)
tree7c626e30fa9b1fc2c03c5ec2c402fa18d9f26a4e /git-cvsimport.txt
parentca1814fe2e4f6e66e4cb81a0bb0e490569a6902c (diff)
downloadgit-htmldocs-e3acfb85c234b3debc7225a9171ab370e24e0324.tar.gz
Autogenerated HTML docs for v1.8.5-rc1-28-g70615
Diffstat (limited to 'git-cvsimport.txt')
-rw-r--r--git-cvsimport.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index d1bcda28f..2df995396 100644
--- a/git-cvsimport.txt
+++ b/git-cvsimport.txt
@@ -144,7 +144,7 @@ This option can be used several times to provide several detection regexes.
CVS by default uses the Unix username when writing its
commit logs. Using this option and an author-conv-file
maps the name recorded in CVS to author name, e-mail and
- optional timezone:
+ optional time zone:
+
---------
exon=Andreas Ericsson <ae@op5.se>
@@ -154,7 +154,7 @@ This option can be used several times to provide several detection regexes.
+
'git cvsimport' will make it appear as those authors had
their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
-all along. If a timezone is specified, GIT_AUTHOR_DATE will
+all along. If a time zone is specified, GIT_AUTHOR_DATE will
have the corresponding offset applied.
+
For convenience, this data is saved to `$GIT_DIR/cvs-authors`