summaryrefslogtreecommitdiffstats
path: root/git-read-tree.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-08 11:40:53 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-08 11:40:53 -0700
commit719b8a3137af7aea177e42a98cdfbb5180a10f33 (patch)
tree0b0aceeacfdab20db87a431a8a95e1388f0d9e19 /git-read-tree.html
parent022bd341a82a08e16719ab8744973feed49e94d3 (diff)
downloadgit-htmldocs-719b8a3137af7aea177e42a98cdfbb5180a10f33.tar.gz
Autogenerated HTML docs for v1.7.11-rc2-2-g02101
Diffstat (limited to 'git-read-tree.html')
-rw-r--r--git-read-tree.html9
1 files changed, 4 insertions, 5 deletions
diff --git a/git-read-tree.html b/git-read-tree.html
index b127622b5..f3853b6bf 100644
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -594,7 +594,7 @@ git-read-tree(1) Manual Page
<div class="sectionbody">
<div class="paragraph"><p>Reads the tree information given by &lt;tree-ish&gt; into the index,
but does not actually <strong>update</strong> any of the files it "caches". (see:
-<a href="git-checkout-index.html">git-checkout-index(1)</a>)</p></div>
+)</p></div>
<div class="paragraph"><p>Optionally, it can merge a tree into the index, perform a
fast-forward (i.e. 2-way) merge, or a 3-way merge, with the <tt>-m</tt>
flag. When used with <tt>-m</tt>, the <tt>-u</tt> flag causes it to also update
@@ -1059,7 +1059,7 @@ have finished your work-in-progress), attempt the merge again.</p></div>
<h2 id="_sparse_checkout">Sparse checkout</h2>
<div class="sectionbody">
<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
+It uses the skip-worktree bit (see ) 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
@@ -1097,12 +1097,11 @@ support.</p></div>
</div>
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<div class="paragraph"><p><a href="git-write-tree.html">git-write-tree(1)</a>; <a href="git-ls-files.html">git-ls-files(1)</a>;
-<a href="gitignore.html">gitignore(5)</a></p></div>
+<div class="paragraph"><p>; ;</p></div>
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+<div class="paragraph"><p>Part of the suite</p></div>
</div>
</div>
<div id="footnotes"><hr /></div>