summaryrefslogtreecommitdiffstats
path: root/git-rev-parse.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-02-19 09:58:14 +0000
committerJunio C Hamano <junio@kernel.org>2010-02-19 09:58:14 +0000
commit4fdccb253a7d0538b30705e7408311950c78fae4 (patch)
tree8f816c4d339f6e75de193fa3f58fb9b356ea0360 /git-rev-parse.html
parent85c44a9175871f71ce4f18363a471d0eca43fb08 (diff)
downloadgit-htmldocs-4fdccb253a7d0538b30705e7408311950c78fae4.tar.gz
Autogenerated HTML docs for v1.7.0-50-g50c1
Diffstat (limited to 'git-rev-parse.html')
-rw-r--r--git-rev-parse.html23
1 files changed, 12 insertions, 11 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html
index 6bb38e85e..1af5d75d3 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -498,7 +498,7 @@ distinguish between them.</p></div>
</dt>
<dd>
<p>
- Show all refs found in <tt>$GIT_DIR/refs</tt>.
+ Show all refs found in <tt>refs/</tt>.
</p>
</dd>
<dt>
@@ -513,9 +513,8 @@ distinguish between them.</p></div>
<dd>
<p>
Show all branches, tags, or remote-tracking branches,
- respectively (i.e., refs found in <tt>$GIT_DIR/refs/heads</tt>,
- <tt>$GIT_DIR/refs/tags</tt>, or <tt>$GIT_DIR/refs/remotes</tt>,
- respectively).
+ respectively (i.e., refs found in <tt>refs/heads</tt>,
+ <tt>refs/tags</tt>, or <tt>refs/remotes</tt>, respectively).
</p>
<div class="para"><p>If a <tt>pattern</tt> is given, only refs matching the given shell glob are
shown. If the pattern does not contain a globbing character (<tt>?</tt>,
@@ -669,7 +668,7 @@ An output from <em>git describe</em>; i.e. a closest tag, optionally
<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
+ object referenced by 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>&lt;name&gt;</tt> is disambiguated by taking the
@@ -684,27 +683,27 @@ if <tt>$GIT_DIR/&lt;name&gt;</tt> exists, that is what you mean (this is usually
</li>
<li>
<p>
-otherwise, <tt>$GIT_DIR/refs/&lt;name&gt;</tt> if exists;
+otherwise, <tt>refs/&lt;name&gt;</tt> if exists;
</p>
</li>
<li>
<p>
-otherwise, <tt>$GIT_DIR/refs/tags/&lt;name&gt;</tt> if exists;
+otherwise, <tt>refs/tags/&lt;name&gt;</tt> if exists;
</p>
</li>
<li>
<p>
-otherwise, <tt>$GIT_DIR/refs/heads/&lt;name&gt;</tt> if exists;
+otherwise, <tt>refs/heads/&lt;name&gt;</tt> if exists;
</p>
</li>
<li>
<p>
-otherwise, <tt>$GIT_DIR/refs/remotes/&lt;name&gt;</tt> if exists;
+otherwise, <tt>refs/remotes/&lt;name&gt;</tt> if exists;
</p>
</li>
<li>
<p>
-otherwise, <tt>$GIT_DIR/refs/remotes/&lt;name&gt;/HEAD</tt> if exists.
+otherwise, <tt>refs/remotes/&lt;name&gt;/HEAD</tt> if exists.
</p>
<div class="para"><p>HEAD names the commit your changes in the working tree is based on.
FETCH_HEAD records the branch you fetched from a remote repository
@@ -715,6 +714,8 @@ you can change the tip of the branch back to the state before you ran
them easily.
MERGE_HEAD records the commit(s) you are merging into your branch
when you run <em>git merge</em>.</p></div>
+<div class="para"><p>Note that any of the <tt>refs/*</tt> cases above may come either from
+the <tt>$GIT_DIR/refs</tt> directory or from the <tt>$GIT_DIR/packed-refs</tt> file.</p></div>
</li>
</ol></div>
</li>
@@ -1057,7 +1058,7 @@ Junio C Hamano &lt;gitster@pobox.com&gt; and Pierre Habouzit &lt;madcoder@debian
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-02-13 00:59:55 UTC
+Last updated 2010-02-19 09:57:46 UTC
</div>
</div>
</body>