Autogenerated HTML docs for v1.6.6-rc0-50-gaf06e

1 files changed, 14 insertions, 11 deletions

diff --git a/git-replace.html b/git-replace.html
index 3fefbfd62..b13d0104e 100644
--- a/git-replace.html
+++ b/git-replace.html
@@ -329,25 +329,28 @@ git-replace(1) Manual Page
 <div class="sectionbody">

 <div class="para"><p>Adds a <em>replace</em> reference in <tt>.git/refs/replace/</tt></p></div>

 <div class="para"><p>The name of the <em>replace</em> reference is the SHA1 of the object that is

-replaced. The content of the replace reference is the SHA1 of the

+replaced. The content of the <em>replace</em> reference is the SHA1 of the

 replacement object.</p></div>

-<div class="para"><p>Unless <tt>-f</tt> is given, the replace reference must not yet exist in

+<div class="para"><p>Unless <tt>-f</tt> is given, the <em>replace</em> reference must not yet exist in

 <tt>.git/refs/replace/</tt> directory.</p></div>

-<div class="para"><p>Replace references will be used by default by all git commands except

-those doing reachability traversal (prune, pack transfer and fsck).</p></div>

-<div class="para"><p>It is possible to disable use of replacement refs for any command

-using the --no-replace-objects option just after "git".</p></div>

-<div class="para"><p>For example if commit "foo" has been replaced by commit "bar":</p></div>

+<div class="para"><p>Replacement references will be used by default by all git commands

+except those doing reachability traversal (prune, pack transfer and

+fsck).</p></div>

+<div class="para"><p>It is possible to disable use of replacement references for any

+command using the <tt>--no-replace-objects</tt> option just after <em>git</em>.</p></div>

+<div class="para"><p>For example if commit <em>foo</em> has been replaced by commit <em>bar</em>:</p></div>

 <div class="listingblock">

 <div class="content">

-<pre><tt>$ git --no-replace-object cat-file commit foo</tt></pre>

+<pre><tt>$ git --no-replace-objects cat-file commit foo</tt></pre>

 </div></div>

-<div class="para"><p>show information about commit "foo", while:</p></div>

+<div class="para"><p>shows information about commit <em>foo</em>, while:</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><tt>$ git cat-file commit foo</tt></pre>

 </div></div>

-<div class="para"><p>show information about commit "bar".</p></div>

+<div class="para"><p>shows information about commit <em>bar</em>.</p></div>

+<div class="para"><p>The <em>GIT_NO_REPLACE_OBJECTS</em> environment variable can be set to

+achieve the same effect as the <tt>--no-replace-objects</tt> option.</p></div>

 </div>

 <h2 id="_options">OPTIONS</h2>

 <div class="sectionbody">

@@ -416,7 +419,7 @@ git-list &lt;git@vger.kernel.org&gt;, based on <em>git tag</em> documentation.</
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-11-15 09:57:17 UTC

+Last updated 2009-11-24 10:53:39 UTC

 </div>

 </div>

 </body>