Autogenerated HTML docs for v1.8.4-357-g8d83

1 files changed, 14 insertions, 14 deletions

diff --git a/git-fast-import.html b/git-fast-import.html
index 0939b4a59..53fb5f2b4 100644
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -1264,8 +1264,8 @@ change to the project.</p></div>
         ('author' (SP &lt;name&gt;)? SP LT &lt;email&gt; GT SP &lt;when&gt; LF)?

         'committer' (SP &lt;name&gt;)? SP LT &lt;email&gt; GT SP &lt;when&gt; LF

         data

-        ('from' SP &lt;committish&gt; LF)?

-        ('merge' SP &lt;committish&gt; LF)?

+        ('from' SP &lt;commit-ish&gt; LF)?

+        ('merge' SP &lt;commit-ish&gt; LF)?

         (filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*

         LF?</code></pre>

 </div></div>

@@ -1334,8 +1334,8 @@ Omitting the <code>from</code> command on existing branches is usually desired,
 as the current commit on that branch is automatically assumed to

 be the first ancestor of the new commit.</p></div>

 <div class="paragraph"><p>As <code>LF</code> is not valid in a Git refname or SHA-1 expression, no

-quoting or escaping syntax is supported within <code>&lt;committish&gt;</code>.</p></div>

-<div class="paragraph"><p>Here <code>&lt;committish&gt;</code> is any of the following:</p></div>

+quoting or escaping syntax is supported within <code>&lt;commit-ish&gt;</code>.</p></div>

+<div class="paragraph"><p>Here <code>&lt;commit-ish&gt;</code> is any of the following:</p></div>

 <div class="ulist"><ul>

 <li>

 <p>

@@ -1393,7 +1393,7 @@ However Git&#8217;s other tools never create commits with more than 15
 additional ancestors (forming a 16-way merge).  For this reason

 it is suggested that frontends do not use more than 15 <code>merge</code>

 commands per commit; 16, if starting a new, empty branch.</p></div>

-<div class="paragraph"><p>Here <code>&lt;committish&gt;</code> is any of the commit specification expressions

+<div class="paragraph"><p>Here <code>&lt;commit-ish&gt;</code> is any of the commit specification expressions

 also accepted by <code>from</code> (see above).</p></div>

 </div>

 <div class="sect3">

@@ -1594,8 +1594,8 @@ paths for a commit are encouraged to do so.</p></div>
 <div class="sect3">

 <h4 id="_code_notemodify_code"><code>notemodify</code></h4>

 <div class="paragraph"><p>Included in a <code>commit</code> <code>&lt;notes_ref&gt;</code> command to add a new note

-annotating a <code>&lt;committish&gt;</code> or change this annotation contents.

-Internally it is similar to filemodify 100644 on <code>&lt;committish&gt;</code>

+annotating a <code>&lt;commit-ish&gt;</code> or change this annotation contents.

+Internally it is similar to filemodify 100644 on <code>&lt;commit-ish&gt;</code>

 path (maybe split into subdirectories). It&#8217;s not advised to

 use any other commands to write to the <code>&lt;notes_ref&gt;</code> tree except

 <code>filedeleteall</code> to delete all existing notes in this tree.

@@ -1613,7 +1613,7 @@ External data format
 </p>

 <div class="literalblock">

 <div class="content">

-<pre><code>        'N' SP &lt;dataref&gt; SP &lt;committish&gt; LF</code></pre>

+<pre><code>        'N' SP &lt;dataref&gt; SP &lt;commit-ish&gt; LF</code></pre>

 </div></div>

 <div class="paragraph"><p>Here <code>&lt;dataref&gt;</code> can be either a mark reference (<code>:&lt;idnum&gt;</code>)

 set by a prior <code>blob</code> command, or a full 40-byte SHA-1 of an

@@ -1630,13 +1630,13 @@ Inline data format
 </p>

 <div class="literalblock">

 <div class="content">

-<pre><code>        'N' SP 'inline' SP &lt;committish&gt; LF

+<pre><code>        'N' SP 'inline' SP &lt;commit-ish&gt; LF

         data</code></pre>

 </div></div>

 <div class="paragraph"><p>See below for a detailed description of the <code>data</code> command.</p></div>

 </dd>

 </dl></div>

-<div class="paragraph"><p>In both formats <code>&lt;committish&gt;</code> is any of the commit specification

+<div class="paragraph"><p>In both formats <code>&lt;commit-ish&gt;</code> is any of the commit specification

 expressions also accepted by <code>from</code> (see above).</p></div>

 </div>

 </div>

@@ -1666,7 +1666,7 @@ lightweight (non-annotated) tags see the <code>reset</code> command below.</p></
 <div class="literalblock">

 <div class="content">

 <pre><code>        'tag' SP &lt;name&gt; LF

-        'from' SP &lt;committish&gt; LF

+        'from' SP &lt;commit-ish&gt; LF

         'tagger' (SP &lt;name&gt;)? SP LT &lt;email&gt; GT SP &lt;when&gt; LF

         data</code></pre>

 </div></div>

@@ -1704,10 +1704,10 @@ branch from an existing commit without creating a new commit.</p></div>
 <div class="literalblock">

 <div class="content">

 <pre><code>        'reset' SP &lt;ref&gt; LF

-        ('from' SP &lt;committish&gt; LF)?

+        ('from' SP &lt;commit-ish&gt; LF)?

         LF?</code></pre>

 </div></div>

-<div class="paragraph"><p>For a detailed description of <code>&lt;ref&gt;</code> and <code>&lt;committish&gt;</code> see above

+<div class="paragraph"><p>For a detailed description of <code>&lt;ref&gt;</code> and <code>&lt;commit-ish&gt;</code> see above

 under <code>commit</code> and <code>from</code>.</p></div>

 <div class="paragraph"><p>The <code>LF</code> after the command is optional (it used to be required).</p></div>

 <div class="paragraph"><p>The <code>reset</code> command can also be used to create lightweight

@@ -2444,7 +2444,7 @@ compression.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2013-09-12 16:24:44 PDT

+Last updated 2013-09-17 14:33:14 PDT

 </div>

 </div>

 </body>