diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-10-26 08:47:29 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-10-26 08:47:29 +0000 |
| commit | 29f1431cd9ec079ebf2d1055c947a1883ddf0fa1 (patch) | |
| tree | c2f5afc4eae006177d04df7239ab3a5c54c7419d /git-rev-parse.html | |
| parent | ff4b4317784217ee2620caf2cd06b3d4b6b00a9a (diff) | |
| download | git-htmldocs-29f1431cd9ec079ebf2d1055c947a1883ddf0fa1.tar.gz | |
Autogenerated HTML docs for v1.4.3.3-ge893f
Diffstat (limited to 'git-rev-parse.html')
| -rw-r--r-- | git-rev-parse.html | 46 |
1 files changed, 42 insertions, 4 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html index 228603a99..987ebc956 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -489,7 +489,7 @@ The full SHA1 object name (40-byte hexadecimal string), or <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.
+ dash, a <tt>g</tt>, and an abbreviated object name.
</p>
</li>
<li>
@@ -498,11 +498,47 @@ 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
explicitly say <em>heads/master</em> to tell git which one you mean.
+ When ambiguous, a <tt><name></tt> is disambiguated by taking the
+ first match in the following rules:
</p>
+<ol>
+<li>
+<p>
+if <tt>$GIT_DIR/<name></tt> exists, that is what you mean (this is usually
+ useful only for <tt>HEAD</tt>, <tt>FETCH_HEAD</tt> and <tt>MERGE_HEAD</tt>);
+</p>
+</li>
+<li>
+<p>
+otherwise, <tt>$GIT_DIR/refs/<name></tt> if exists;
+</p>
+</li>
+<li>
+<p>
+otherwise, <tt>$GIT_DIR/refs/tags/<name></tt> if exists;
+</p>
+</li>
+<li>
+<p>
+otherwise, <tt>$GIT_DIR/refs/heads/<name></tt> if exists;
+</p>
+</li>
+<li>
+<p>
+otherwise, <tt>$GIT_DIR/refs/remotes/<name></tt> if exists;
+</p>
+</li>
+<li>
+<p>
+otherwise, <tt>$GIT_DIR/refs/remotes/<name>/HEAD</tt> if exists.
+</p>
+</li>
+</ol>
</li>
<li>
<p>
-A suffix <em>@</em> followed by a date specification enclosed in a brace
+A ref followed by the suffix <em>@</em> with a date specification
+ enclosed in a brace
pair (e.g. <em>{yesterday}</em>, <em>{1 month 2 weeks 3 days 1 hour 1
second ago}</em> or <em>{1979-02-26 18:30:00}</em>) to specify the value
of the ref at a prior point in time. This suffix may only be
@@ -525,7 +561,9 @@ A suffix <em>^</em> to a revision parameter means the first parent of A suffix <em>~<n></em> to a revision parameter means the commit
object that is the <n>th generation grand-parent of the named
commit object, following only the first parent. I.e. rev~3 is
- equivalent to rev^^^ which is equivalent to rev^1^1^1.
+ equivalent to rev^^^ which is equivalent to
+ rev^1^1^1. See below for a illustration of
+ the usage of this form.
</p>
</li>
<li>
@@ -637,7 +675,7 @@ Junio C Hamano <junkio@cox.net></p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 19-Oct-2006 05:58:41 UTC
+Last updated 26-Oct-2006 08:47:20 UTC
</div>
</div>
</body>
|