summaryrefslogtreecommitdiffstats
path: root/git-cvsimport.html
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.html
parentca1814fe2e4f6e66e4cb81a0bb0e490569a6902c (diff)
downloadgit-htmldocs-e3acfb85c234b3debc7225a9171ab370e24e0324.tar.gz
Autogenerated HTML docs for v1.8.5-rc1-28-g70615
Diffstat (limited to 'git-cvsimport.html')
-rw-r--r--git-cvsimport.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-cvsimport.html b/git-cvsimport.html
index 9cfd5f5b5..b90aabdc0 100644
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -971,7 +971,7 @@ the old cvs2git tool.</p></div>
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:
</p>
<div class="listingblock">
<div class="content">
@@ -980,7 +980,7 @@ the old cvs2git tool.</p></div>
</div></div>
<div class="paragraph"><p><em>git cvsimport</em> 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.</p></div>
<div class="paragraph"><p>For convenience, this data is saved to <code>$GIT_DIR/cvs-authors</code>
each time the <em>-A</em> option is provided and read from that same
@@ -1103,7 +1103,7 @@ cvs2git (part of cvs2svn), <code>http://subversion.apache.org/</code>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-11-12 15:22:25 PST
</div>
</div>
</body>