summaryrefslogtreecommitdiffstats
path: root/git-fast-import.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-02 15:02:46 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-02 15:02:46 -0700
commitb76a68630eaab75c4eb1c41f0fc091811854ff43 (patch)
tree5be60264e80970f60d9c56b410c8828693be8588 /git-fast-import.html
parent0aadbc37c068365a09926cd895863c4a725b45d6 (diff)
downloadgit-htmldocs-b76a68630eaab75c4eb1c41f0fc091811854ff43.tar.gz
Autogenerated HTML docs for v1.7.10.1-433-g34875
Diffstat (limited to 'git-fast-import.html')
-rw-r--r--git-fast-import.html20
1 files changed, 10 insertions, 10 deletions
diff --git a/git-fast-import.html b/git-fast-import.html
index 6442cdfc3..f61958ec3 100644
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -881,9 +881,9 @@ in the --date-format=&lt;fmt&gt; command line option.</p></div>
<div class="paragraph"><p>The time of the event is specified by <tt>&lt;time&gt;</tt> as the number of
seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is
written as an ASCII decimal integer.</p></div>
-<div class="paragraph"><p>The local offset is specified by <tt>&lt;offutc&gt;</tt> as a positive or negative
+<div class="paragraph"><p>The local offset is specified by &#8216;&lt;offutc&gt;` as a positive or negative
offset from UTC. For example EST (which is 5 hours behind UTC)
-would be expressed in <tt>&lt;tz&gt;</tt> by &#8220;-0500&#8221; while UTC is &#8220;+0000&#8221;.
+would be expressed in <tt>&lt;tz&gt;</tt> by <tt>`-0500'' while UTC is `</tt>+0000&#8217;'.
The local offset does not affect <tt>&lt;time&gt;</tt>; it is used only as an
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
@@ -1113,8 +1113,8 @@ the fields in <tt>author</tt>, as they are identical to <tt>committer</tt>.</p><
<div class="paragraph"><p>The <tt>committer</tt> command indicates who made this commit, and when
they made it.</p></div>
<div class="paragraph"><p>Here <tt>&lt;name&gt;</tt> is the person&#8217;s display name (for example
-&#8220;Com M Itter&#8221;) and <tt>&lt;email&gt;</tt> is the person&#8217;s email address
-(&#8220;<a href="mailto:cm@example.com">cm@example.com</a>&#8221;). <tt>LT</tt> and <tt>GT</tt> are the literal less-than (\x3c)
+<tt>`Com M Itter'') and `&lt;email&gt;</tt> is the person&#8217;s email address
+(<tt>`cm@example.com''). `LT</tt> and <tt>GT</tt> are the literal less-than (\x3c)
and greater-than (\x3e) symbols. These are required to delimit
the email address from the other fields in the line. Note that
<tt>&lt;name&gt;</tt> and <tt>&lt;email&gt;</tt> are free-form and may contain any sequence
@@ -1176,9 +1176,9 @@ current branch value should be written as:</p></div>
<div class="content">
<pre><tt> from refs/heads/branch^0</tt></pre>
</div></div>
-<div class="paragraph"><p>The <tt>&#94;0</tt> suffix is necessary as fast-import does not permit a branch to
+<div class="paragraph"><p>The <tt>^0</tt> suffix is necessary as fast-import does not permit a branch to
start from itself, and the branch is created in memory before the
-<tt>from</tt> command is even read from the input. Adding <tt>&#94;0</tt> will force
+<tt>from</tt> command is even read from the input. Adding <tt>^0</tt> will force
fast-import to resolve the commit through Git&#8217;s revision parsing library,
rather than its internal branch table, thereby loading in the
existing value of the branch.</p></div>
@@ -1686,7 +1686,7 @@ Reading from a named tree
</dd>
</dl></div>
<div class="paragraph"><p>See <tt>filemodify</tt> above for a detailed description of <tt>&lt;path&gt;</tt>.</p></div>
-<div class="paragraph"><p>Output uses the same format as <tt>git ls-tree &lt;tree&gt; &#45;&#45; &lt;path&gt;</tt>:</p></div>
+<div class="paragraph"><p>Output uses the same format as <tt>git ls-tree &lt;tree&gt; -- &lt;path&gt;</tt>:</p></div>
<div class="exampleblock">
<div class="exampleblock-content">
<div class="literalblock">
@@ -2009,8 +2009,8 @@ during a commit.</p></div>
files which are not from the same commit/changeset. Or to create
tags which are a subset of the files available in the repository.</p></div>
<div class="paragraph"><p>Importing these tags as-is in Git is impossible without making at
-least one commit which &#8220;fixes up&#8221; the files to match the content
-of the tag. Use fast-import&#8217;s <tt>reset</tt> command to reset a dummy branch
+least one commit which <tt>`fixes up'' the files to match the content
+of the tag. Use fast-import's `reset</tt> command to reset a dummy branch
outside of your normal branch space to the base commit for the tag,
then commit one or more file fixup commits, and finally tag the
dummy branch.</p></div>
@@ -2160,7 +2160,7 @@ compression.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-04-23 13:55:31 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>