Autogenerated HTML docs for v1.7.8.2-321-g4570a

1 files changed, 5 insertions, 6 deletions

diff --git a/git-read-tree.html b/git-read-tree.html
index 24a40dfa8..0caacf638 100644
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -716,11 +716,10 @@ when both sides add a path identically.  The resolution
 <dd>

 <p>

         Keep the current index contents, and read the contents

-        of the named tree-ish under the directory at <tt>&lt;prefix&gt;</tt>. The

-        original index file cannot have anything at the path

-        <tt>&lt;prefix&gt;</tt> itself, nor anything in the <tt>&lt;prefix&gt;/</tt>

-        directory.  Note that the <tt>&lt;prefix&gt;/</tt> value must end

-        with a slash.

+        of the named tree-ish under the directory at <tt>&lt;prefix&gt;</tt>.

+        The command will refuse to overwrite entries that already

+        existed in the original index file. Note that the <tt>&lt;prefix&gt;/</tt>

+        value must end with a slash.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1109,7 +1108,7 @@ support.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-11-15 13:45:02 PDT

+Last updated 2012-01-03 16:22:22 PDT

 </div>

 </div>

 </body>