diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2006-10-19 05:58:48 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2006-10-19 05:58:48 +0000 |
commit | fbe0052a6097e716bc4ad9676c3c4d6f472a1d8d (patch) | |
tree | a926e3dc0d853abf06ca1e0de4ae19340c8a5c72 /git-rev-parse.html | |
parent | 21c0b42d4578867273ad6bc14fb225d61aa6f67e (diff) | |
download | git-htmldocs-fbe0052a6097e716bc4ad9676c3c4d6f472a1d8d.tar.gz |
Autogenerated HTML docs for v1.4.3-g72bb
Diffstat (limited to 'git-rev-parse.html')
-rw-r--r-- | git-rev-parse.html | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html index c9005d772..228603a99 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -473,7 +473,9 @@ distinguish between them.</p> <div class="sectionbody">
<p>A revision parameter typically, but not necessarily, names a
commit object. They use what is called an <em>extended SHA1</em>
-syntax.</p>
+syntax. Here are various ways to spell object names. The
+ones listed near the end of this list are to name trees and
+blobs contained in a commit.</p>
<ul>
<li>
<p>
@@ -486,6 +488,12 @@ The full SHA1 object name (40-byte hexadecimal string), or </li>
<li>
<p>
+An output from <tt>git-describe</tt>; i.e. a closest tag, followed by a
+ dash, a <em>g</em>, and an abbreviated object name.
+</p>
+</li>
+<li>
+<p>
A symbolic ref name. E.g. <em>master</em> typically means the commit
object referenced by $GIT_DIR/refs/heads/master. If you
happen to have both heads/master and tags/master, you can
@@ -538,6 +546,21 @@ A suffix <em>^</em> followed by an empty brace pair found.
</p>
</li>
+<li>
+<p>
+A suffix <em>:</em> followed by a path; this names the blob or tree
+ at the given path in the tree-ish object named by the part
+ before the colon.
+</p>
+</li>
+<li>
+<p>
+A colon, optionally followed by a stage number (0 to 3) and a
+ colon, followed by a path; this names a blob object in the
+ index at the given path. Missing stage number (and the colon
+ that follows it) names an stage 0 entry.
+</p>
+</li>
</ul>
<p>Here is an illustration, by Jon Loeliger. Both node B and C are
a commit parents of commit node A. Parent commits are ordered
@@ -614,7 +637,7 @@ Junio C Hamano <junkio@cox.net></p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 03-Oct-2006 08:41:26 UTC
+Last updated 19-Oct-2006 05:58:41 UTC
</div>
</div>
</body>
|