summaryrefslogtreecommitdiffstats
path: root/git-fast-import.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 12:16:29 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-06 12:16:29 -0700
commite1aeb5ef657d0c4fdff12a9c7503431edd9cd128 (patch)
tree0b26e69547edd5d5bbc66d1dd470d1ce66463b1e /git-fast-import.html
parentb051caf02ee59e3c9d1da4a61339f667f28754d1 (diff)
downloadgit-htmldocs-e1aeb5ef657d0c4fdff12a9c7503431edd9cd128.tar.gz
Autogenerated HTML docs for v2.0.0-239-g09531
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 8716428e3..d7662b303 100644
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -1057,7 +1057,7 @@ frontend and useful when inspecting a fast-import data stream.</p></div>
<h3 id="_date_formats">Date Formats</h3>
<div class="paragraph"><p>The following date formats are supported. A frontend should select
the format it will use for this import by passing the format name
-in the --date-format=&lt;fmt&gt; command line option.</p></div>
+in the --date-format=&lt;fmt&gt; command-line option.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
<tt>raw</tt>
@@ -1213,7 +1213,7 @@ and control the current import process. More detailed discussion
<p>
Marks the end of the stream. This command is optional
unless the <tt>done</tt> feature was requested using the
- <tt>--done</tt> command line option or <tt>feature done</tt> command.
+ <tt>--done</tt> command-line option or <tt>feature done</tt> command.
</p>
</dd>
<dt class="hdlist1">
@@ -1317,7 +1317,7 @@ 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
of bytes, except <tt>LT</tt>, <tt>GT</tt> and <tt>LF</tt>. <tt>&lt;name&gt;</tt> is typically UTF-8 encoded.</p></div>
<div class="paragraph"><p>The time of the change is specified by <tt>&lt;when&gt;</tt> using the date format
-that was selected by the --date-format=&lt;fmt&gt; command line option.
+that was selected by the --date-format=&lt;fmt&gt; command-line option.
See &#8220;Date Formats&#8221; above for the set of supported formats, and
their syntax.</p></div>
</div>
@@ -2055,7 +2055,7 @@ without the leading <em>--</em> and is treated in the same way.</p></div>
<div class="paragraph"><p>Option commands must be the first commands on the input (not counting
feature commands), to give an option command after any non-option
command is an error.</p></div>
-<div class="paragraph"><p>The following commandline options change import semantics and may therefore
+<div class="paragraph"><p>The following command-line options change import semantics and may therefore
not be passed as option:</p></div>
<div class="ulist"><ul>
<li>
@@ -2089,7 +2089,7 @@ force
<h3 id="_tt_done_tt"><tt>done</tt></h3>
<div class="paragraph"><p>If the <tt>done</tt> feature is not in use, treated as if EOF was read.
This can be used to tell fast-import to finish early.</p></div>
-<div class="paragraph"><p>If the <tt>--done</tt> command line option or <tt>feature done</tt> command is
+<div class="paragraph"><p>If the <tt>--done</tt> command-line option or <tt>feature done</tt> command is
in use, the <tt>done</tt> command is mandatory and marks the end of the
stream.</p></div>
</div>
@@ -2448,7 +2448,7 @@ compression.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-11-12 15:22:25 PST
+Last updated 2014-06-06 12:15:38 PDT
</div>
</div>
</body>