diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2009-04-08 07:36:32 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2009-04-08 07:36:32 +0000 |
commit | b4a9ede67c31b37be6bc1ac69406ccafe843ffaf (patch) | |
tree | fa4d020290acf32e59b7e577ccdad0c3aa91ebd9 /git-checkout.html | |
parent | 5f9a6f09653d6397ddb553c1824279557ba878a7 (diff) | |
download | git-htmldocs-b4a9ede67c31b37be6bc1ac69406ccafe843ffaf.tar.gz |
Autogenerated HTML docs for v1.6.2.2-471-g6da14
Diffstat (limited to 'git-checkout.html')
-rw-r--r-- | git-checkout.html | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/git-checkout.html b/git-checkout.html index ce91a6c43..631847dc3 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -489,12 +489,21 @@ the conflicted merge in the specified paths.</p></div> </p>
</dd>
<dt>
+<tree-ish>
+</dt>
+<dd>
+<p>
+ Tree to checkout from (when paths are given). If not specified,
+ the index will be used.
+</p>
+</dd>
+<dt>
<branch>
</dt>
<dd>
<p>
- Branch to checkout; may be any object ID that resolves to a
- commit. Defaults to HEAD.
+ Branch to checkout (when no paths are given); may be any object
+ ID that resolves to a commit. Defaults to HEAD.
</p>
<div class="para"><p>When this parameter names a non-branch (but still a valid commit object),
your HEAD becomes <em>detached</em>.</p></div>
@@ -565,7 +574,7 @@ take a file out of another commit </li>
<li>
<p>
-restore hello.c from HEAD of current branch
+restore hello.c from the index
</p>
<div class="para"><p>If you have an unfortunate branch that is named <tt>hello.c</tt>, this
step would be confused as an instruction to switch to that branch.
@@ -643,7 +652,7 @@ $ git add frotz</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-04-02 06:49:46 UTC
+Last updated 2009-04-08 07:36:11 UTC
</div>
</div>
</body>
|