summaryrefslogtreecommitdiffstats
path: root/git-fast-import.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-fast-import.html
parentca1814fe2e4f6e66e4cb81a0bb0e490569a6902c (diff)
downloadgit-htmldocs-e3acfb85c234b3debc7225a9171ab370e24e0324.tar.gz
Autogenerated HTML docs for v1.8.5-rc1-28-g70615
Diffstat (limited to 'git-fast-import.html')
-rw-r--r--git-fast-import.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/git-fast-import.html b/git-fast-import.html
index 53fb5f2b4..6b8249976 100644
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -1075,7 +1075,7 @@ advisement to help formatting routines display the timestamp.</p></div>
<div class="paragraph"><p>If the local offset is not available in the source material, use
&#8220;+0000&#8221;, or the most common local offset. For example many
organizations have a CVS repository which has only ever been accessed
-by users who are located in the same location and timezone. In this
+by users who are located in the same location and time zone. In this
case a reasonable offset from UTC could be assumed.</p></div>
<div class="paragraph"><p>Unlike the <code>rfc2822</code> format, this format is very strict. Any
variation in formatting will cause fast-import to reject the value.</p></div>
@@ -1096,7 +1096,7 @@ these cases Git will still be able to obtain the correct date from
the malformed string. There are also some types of malformed
strings which Git will parse wrong, and yet consider valid.
Seriously malformed strings will be rejected.</p></div>
-<div class="paragraph"><p>Unlike the <code>raw</code> format above, the timezone/UTC offset information
+<div class="paragraph"><p>Unlike the <code>raw</code> format above, the time zone/UTC offset information
contained in an RFC 2822 date string is used to adjust the date
value to UTC prior to storage. Therefore it is important that
this information be as accurate as possible.</p></div>
@@ -1114,13 +1114,13 @@ ambiguity in parsing.</p></div>
</dt>
<dd>
<p>
- Always use the current time and timezone. The literal
+ Always use the current time and time zone. The literal
<code>now</code> must always be supplied for <code>&lt;when&gt;</code>.
</p>
-<div class="paragraph"><p>This is a toy format. The current time and timezone of this system
+<div class="paragraph"><p>This is a toy format. The current time and time zone of this system
is always copied into the identity string at the time it is being
created by fast-import. There is no way to specify a different time or
-timezone.</p></div>
+time zone.</p></div>
<div class="paragraph"><p>This particular format is supplied as it&#8217;s short to implement and
may be useful to a process that wants to create a new commit
right now, without needing to use a working directory or
@@ -2444,7 +2444,7 @@ compression.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-09-17 14:33:14 PDT
+Last updated 2013-11-12 15:22:25 PST
</div>
</div>
</body>