Autogenerated HTML docs for v1.7.7-138-g7f41b6

1 files changed, 25 insertions, 25 deletions

diff --git a/git-read-tree.html b/git-read-tree.html
index 4dbb4370b..1b00b22e1 100644
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -640,7 +640,7 @@ will be in unmerged state when <em>git read-tree</em> returns.</p></div>
 <dd>

 <p>

         Usually a merge requires the index file as well as the

-        files in the working tree are up to date with the

+        files in the working tree to be up to date with the

         current head commit, in order not to lose local

         changes.  This flag disables the check with the working

         tree and is meant to be used when creating a merge of

@@ -686,9 +686,9 @@ will be in unmerged state when <em>git read-tree</em> returns.</p></div>
 <p>

         Usually a three-way merge by <em>git read-tree</em> resolves

         the merge for really trivial cases and leaves other

-        cases unresolved in the index, so that Porcelains can

+        cases unresolved in the index, so that porcelains can

         implement different merge policies.  This flag makes the

-        command to resolve a few more cases internally:

+        command resolve a few more cases internally:

 </p>

 <div class="ulist"><ul>

 <li>

@@ -704,7 +704,7 @@ when both sides remove a path.  The resolution is to remove that path.
 </li>

 <li>

 <p>

-when both sides adds a path identically.  The resolution

+when both sides add a path identically.  The resolution

   is to add that path.

 </p>

 </li>

@@ -716,9 +716,9 @@ when both sides adds a path identically.  The resolution
 <dd>

 <p>

         Keep the current index contents, and read the contents

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

+        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, and have nothing in <tt>&lt;prefix&gt;/</tt>

+        <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.

 </p>

@@ -1059,40 +1059,40 @@ have finished your work-in-progress), attempt the merge again.</p></div>
 </div>

 <h2 id="_sparse_checkout">Sparse checkout</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>"Sparse checkout" allows to sparsely populate working directory.

-It uses skip-worktree bit (see <a href="git-update-index.html">git-update-index(1)</a>) to tell

-Git whether a file on working directory is worth looking at.</p></div>

-<div class="paragraph"><p>"git read-tree" and other merge-based commands ("git merge", "git

-checkout"&#8230;) can help maintaining skip-worktree bitmap and working

+<div class="paragraph"><p>"Sparse checkout" allows populating the working directory sparsely.

+It uses the skip-worktree bit (see <a href="git-update-index.html">git-update-index(1)</a>) to tell

+Git whether a file in the working directory is worth looking at.</p></div>

+<div class="paragraph"><p><em>git read-tree</em> and other merge-based commands (<em>git merge</em>, <em>git

+checkout</em>&#8230;) can help maintaining the skip-worktree bitmap and working

 directory update. <tt>$GIT_DIR/info/sparse-checkout</tt> is used to

-define the skip-worktree reference bitmap. When "git read-tree" needs

-to update working directory, it will reset skip-worktree bit in index

+define the skip-worktree reference bitmap. When <em>git read-tree</em> needs

+to update the working directory, it resets the skip-worktree bit in the index

 based on this file, which uses the same syntax as .gitignore files.

-If an entry matches a pattern in this file, skip-worktree will be

-set on that entry. Otherwise, skip-worktree will be unset.</p></div>

+If an entry matches a pattern in this file, skip-worktree will not be

+set on that entry. Otherwise, skip-worktree will be set.</p></div>

 <div class="paragraph"><p>Then it compares the new skip-worktree value with the previous one. If

-skip-worktree turns from unset to set, it will add the corresponding

-file back. If it turns from set to unset, that file will be removed.</p></div>

+skip-worktree turns from set to unset, it will add the corresponding

+file back. If it turns from unset to set, that file will be removed.</p></div>

 <div class="paragraph"><p>While <tt>$GIT_DIR/info/sparse-checkout</tt> is usually used to specify what

-files are in. You can also specify what files are <em>not</em> in, using

-negate patterns. For example, to remove file "unwanted":</p></div>

+files are in, you can also specify what files are <em>not</em> in, using

+negate patterns. For example, to remove the file <tt>unwanted</tt>:</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><tt>*

 !unwanted</tt></pre>

 </div></div>

-<div class="paragraph"><p>Another tricky thing is fully repopulating working directory when you

+<div class="paragraph"><p>Another tricky thing is fully repopulating the working directory when you

 no longer want sparse checkout. You cannot just disable "sparse

-checkout" because skip-worktree are still in the index and you working

-directory is still sparsely populated. You should re-populate working

+checkout" because skip-worktree bits are still in the index and your working

+directory is still sparsely populated. You should re-populate the working

 directory with the <tt>$GIT_DIR/info/sparse-checkout</tt> file content as

 follows:</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><tt>*</tt></pre>

 </div></div>

-<div class="paragraph"><p>Then you can disable sparse checkout. Sparse checkout support in "git

-read-tree" and similar commands is disabled by default. You need to

+<div class="paragraph"><p>Then you can disable sparse checkout. Sparse checkout support in <em>git

+read-tree</em> and similar commands is disabled by default. You need to

 turn <tt>core.sparseCheckout</tt> on in order to have sparse checkout

 support.</p></div>

 </div>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-09-21 23:01:14 PDT

+Last updated 2011-10-05 13:59:16 PDT

 </div>

 </div>

 </body>