diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
| commit | 1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch) | |
| tree | 72812d480799e16b94f9cfed423b8d7d45c7fb4f /git-merge-index.html | |
| parent | a9701f0184382d8de7380c56558718915905746a (diff) | |
| download | git-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz | |
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-merge-index.html')
| -rw-r--r-- | git-merge-index.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-merge-index.html b/git-merge-index.html index 8557c3276..62ece82f2 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -370,12 +370,12 @@ files are passed as arguments 5, 6 and 7.</p></div> </p>
</dd>
</dl></div>
-<div class="para"><p>If <em>git-merge-index</em> is called with multiple <file>s (or -a) then it
+<div class="para"><p>If <em>git merge-index</em> is called with multiple <file>s (or -a) then it
processes them in turn only stopping if merge returns a non-zero exit
code.</p></div>
<div class="para"><p>Typically this is run with a script calling git's imitation of
the <em>merge</em> command from the RCS package.</p></div>
-<div class="para"><p>A sample script called <em>git-merge-one-file</em> is included in the
+<div class="para"><p>A sample script called <em>git merge-one-file</em> is included in the
distribution.</p></div>
<div class="para"><p>ALERT ALERT ALERT! The git "merge object order" is different from the
RCS <em>merge</em> program merge object order. In the above ordering, the
@@ -400,10 +400,10 @@ This is added AA in the branch B. This is added AA in the branch B.
fatal: merge program failed</tt></pre>
</div></div>
-<div class="para"><p>where the latter example shows how <em>git-merge-index</em> will stop trying to
+<div class="para"><p>where the latter example shows how <em>git merge-index</em> 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
-<em>git-merge-index</em> didn't even try to merge the MM thing).</p></div>
+<em>git merge-index</em> didn't even try to merge the MM thing).</p></div>
</div>
<h2 id="_author">Author</h2>
<div class="sectionbody">
@@ -420,7 +420,7 @@ One-shot merge by Petr Baudis <pasky@ucw.cz></p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-12-03 09:12:40 UTC
+Last updated 2010-01-21 17:44:32 UTC
</div>
</div>
</body>
|