Autogenerated HTML docs for v1.5.6.1-156-ge903b

1 files changed, 11 insertions, 11 deletions

diff --git a/git-merge-index.html b/git-merge-index.html
index 8d1b15146..5c5e0f9d5 100644
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -272,7 +272,7 @@ git-merge-index(1) Manual Page
 </div>

 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

-<p><em>git-merge-index</em> [-o] [-q] &lt;merge-program&gt; (-a | [--] &lt;file&gt;*)</p>

+<p><em>git merge-index</em> [-o] [-q] &lt;merge-program&gt; (-a | [--] &lt;file&gt;*)</p>

 </div>

 <h2>DESCRIPTION</h2>

 <div class="sectionbody">

@@ -322,21 +322,21 @@ files are passed as arguments 5, 6 and 7.</p>
 </p>

 </dd>

 </dl>

-<p>If "git-merge-index" is called with multiple &lt;file&gt;s (or -a) then it

+<p>If <tt>git-merge-index</tt> is called with multiple &lt;file&gt;s (or -a) then it

 processes them in turn only stopping if merge returns a non-zero exit

 code.</p>

 <p>Typically this is run with a script calling git's imitation of

 the merge command from the RCS package.</p>

-<p>A sample script called "git-merge-one-file" is included in the

+<p>A sample script called <tt>git-merge-one-file</tt> is included in the

 distribution.</p>

 <p>ALERT ALERT ALERT! The git "merge object order" is different from the

-RCS "merge" program merge object order. In the above ordering, the

+RCS <tt>merge</tt> program merge object order. In the above ordering, the

 original is first. But the argument order to the 3-way merge program

-"merge" is to have the original in the middle. Don't ask me why.</p>

+<tt>merge</tt> is to have the original in the middle. Don't ask me why.</p>

 <p>Examples:</p>

 <div class="literalblock">

 <div class="content">

-<pre><tt>torvalds@ppc970:~/merge-test&gt; git-merge-index cat MM

+<pre><tt>torvalds@ppc970:~/merge-test&gt; git merge-index cat MM

 This is MM from the original tree.                    # original

 This is modified MM in the branch A.                  # merge1

 This is modified MM in the branch B.                  # merge2

@@ -345,17 +345,17 @@ This is modified MM in the branch B.                  # current contents</tt></p
 <p>or</p>

 <div class="literalblock">

 <div class="content">

-<pre><tt>torvalds@ppc970:~/merge-test&gt; git-merge-index cat AA MM

+<pre><tt>torvalds@ppc970:~/merge-test&gt; git merge-index cat AA MM

 cat: : No such file or directory

 This is added AA in the branch A.

 This is added AA in the branch B.

 This is added AA in the branch B.

 fatal: merge program failed</tt></pre>

 </div></div>

-<p>where the latter example shows how "git-merge-index" will stop trying to

-merge once anything has returned an error (i.e., "cat" returned an error

+<p>where the latter example shows how <tt>git-merge-index</tt> will stop trying to

+merge once anything has returned an error (i.e., <tt>cat</tt> returned an error

 for the AA file, because it didn't exist in the original, and thus

-"git-merge-index" didn't even try to merge the MM thing).</p>

+<tt>git-merge-index</tt> didn't even try to merge the MM thing).</p>

 </div>

 <h2>Author</h2>

 <div class="sectionbody">

@@ -372,7 +372,7 @@ One-shot merge by Petr Baudis &lt;pasky@ucw.cz&gt;</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 08-Jun-2008 01:33:53 UTC

+Last updated 02-Jul-2008 03:01:53 UTC

 </div>

 </div>

 </body>