summaryrefslogtreecommitdiffstats
path: root/git-checkout.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-10 15:29:34 -0700
committerJunio C Hamano <gitster@pobox.com>2015-07-10 15:29:34 -0700
commit823eebb8a31b328e252543cfa25ebf5c575fa6d8 (patch)
treedfd5992a4dc3ebf603b43ea8b24f3c47e7b7796d /git-checkout.html
parent2f7978279c72985d4856b2bd0fdde97473366213 (diff)
downloadgit-htmldocs-823eebb8a31b328e252543cfa25ebf5c575fa6d8.tar.gz
Autogenerated HTML docs for v2.5.0-rc1-32-ge59f6
Diffstat (limited to 'git-checkout.html')
-rw-r--r--git-checkout.html7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-checkout.html b/git-checkout.html
index dcb683021..83985b28b 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -739,7 +739,7 @@ git-checkout(1) Manual Page
<h2>NAME</h2>
<div class="sectionbody">
<p>git-checkout -
- Checkout a branch or paths to the working tree
+ Switch branches or restore working tree files
</p>
</div>
</div>
@@ -845,6 +845,9 @@ be used to detach HEAD at the tip of the branch (<code>git checkout
(i.e. commit, tag or tree) to update the index for the given
paths before updating the working tree.
</p>
+<div class="paragraph"><p><em>git checkout</em> with &lt;paths&gt; or <code>--patch</code> is used to restore modified or
+deleted paths to their original contents from the index or replace paths
+with the contents from a named &lt;tree-ish&gt; (most often a commit-ish).</p></div>
<div class="paragraph"><p>The index may contain unmerged entries because of a previous failed merge.
By default, if you try to check out such an entry from the index, the
checkout operation will fail and nothing will be checked out.
@@ -1444,7 +1447,7 @@ $ git add frotz</code></pre>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-05-11 15:40:21 PDT
+Last updated 2015-07-10 15:27:19 PDT
</div>
</div>
</body>