diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-15 13:12:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-15 13:12:29 -0800 |
| commit | 4eb2b9c1b93402514bbab7ad58ab8181526cd874 (patch) | |
| tree | 75bbeb0edef3384164208c2373f0d1b406c6351a /git-cvsimport.html | |
| parent | a129545d44f1f0fe9976ed87b9a7331bf239b7d8 (diff) | |
| download | git-htmldocs-4eb2b9c1b93402514bbab7ad58ab8181526cd874.tar.gz | |
Autogenerated HTML docs for v1.8.0-197-g5a907
Diffstat (limited to 'git-cvsimport.html')
| -rw-r--r-- | git-cvsimport.html | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/git-cvsimport.html b/git-cvsimport.html index 25b2c9121..47fed714c 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -798,16 +798,18 @@ the old cvs2git tool.</p></div> <p>
CVS by default uses the Unix username when writing its
commit logs. Using this option and an author-conv-file
- in this format
+ maps the name recorded in CVS to author name, e-mail and
+ optional timezone:
</p>
<div class="listingblock">
<div class="content">
<pre><tt> exon=Andreas Ericsson <ae@op5.se>
- spawn=Simon Pawn <spawn@frog-pond.org></tt></pre>
+ spawn=Simon Pawn <spawn@frog-pond.org> America/Chicago</tt></pre>
</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.</p></div>
+all along. If a timezone is specified, GIT_AUTHOR_DATE will
+have the corresponding offset applied.</p></div>
<div class="paragraph"><p>For convenience, this data is saved to <tt>$GIT_DIR/cvs-authors</tt>
each time the <em>-A</em> option is provided and read from that same
file each time <em>git cvsimport</em> is run.</p></div>
@@ -928,7 +930,7 @@ parsecvs, <tt>http://cgit.freedesktop.org/~keithp/parsecvs</tt> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-11-15 13:11:54 PDT
</div>
</div>
</body>
|