summaryrefslogtreecommitdiffstats
path: root/git-rev-parse.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-06-16 09:54:05 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-06-16 09:54:05 +0000
commit6926bef5df36f65153ad9f9ab9202acc6d44cd5d (patch)
tree5d1c642cbaae99018f2cc259dfdc4202e8780115 /git-rev-parse.html
parent9e52d4ea667a8100ea390c15adae60a56a410699 (diff)
downloadgit-htmldocs-6926bef5df36f65153ad9f9ab9202acc6d44cd5d.tar.gz
Autogenerated HTML docs for v1.5.2.2-236-g952c8
Diffstat (limited to 'git-rev-parse.html')
-rw-r--r--git-rev-parse.html44
1 files changed, 22 insertions, 22 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html
index 0777e5f87..0ebcd0997 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -356,8 +356,8 @@ distinguish between them.</p>
</dt>
<dd>
<p>
- When showing object names, prefix them with <em>^</em> and
- strip <em>^</em> prefix from the object names that already have
+ When showing object names, prefix them with <em>&#94;</em> and
+ strip <em>&#94;</em> prefix from the object names that already have
one.
</p>
</dd>
@@ -367,7 +367,7 @@ distinguish between them.</p>
<dd>
<p>
Usually the object names are output in SHA1 form (with
- possible <em>^</em> prefix); this option makes them output in a
+ possible <em>&#94;</em> prefix); this option makes them output in a
form as close to the original input as possible.
</p>
</dd>
@@ -566,11 +566,11 @@ You can use the <em>@</em> construct with an empty ref part to get at a
</li>
<li>
<p>
-A suffix <em>^</em> to a revision parameter means the first parent of
- that commit object. <em>^&lt;n&gt;</em> means the &lt;n&gt;th parent (i.e.
- <em>rev^</em>
- is equivalent to <em>rev^1</em>). As a special rule,
- <em>rev^0</em> means the commit itself and is used when <em>rev</em> is the
+A suffix <em>&#94;</em> to a revision parameter means the first parent of
+ that commit object. <em>&#94;&lt;n&gt;</em> means the &lt;n&gt;th parent (i.e.
+ <em>rev&#94;</em>
+ is equivalent to <em>rev&#94;1</em>). As a special rule,
+ <em>rev&#94;0</em> means the commit itself and is used when <em>rev</em> is the
object name of a tag object that refers to a commit object.
</p>
</li>
@@ -579,25 +579,25 @@ A suffix <em>^</em> to a revision parameter means the first parent of
A suffix <em>&#126;&lt;n&gt;</em> to a revision parameter means the commit
object that is the &lt;n&gt;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. See below for a illustration of
+ equivalent to rev&#94;&#94;&#94; which is equivalent to
+ rev&#94;1&#94;1&#94;1. See below for a illustration of
the usage of this form.
</p>
</li>
<li>
<p>
-A suffix <em>^</em> followed by an object type name enclosed in
- brace pair (e.g. <tt>v0.99.8^{commit}</tt>) means the object
+A suffix <em>&#94;</em> followed by an object type name enclosed in
+ brace pair (e.g. <tt>v0.99.8&#94;{commit}</tt>) means the object
could be a tag, and dereference the tag recursively until an
object of that type is found or the object cannot be
- dereferenced anymore (in which case, barf). <tt>rev^0</tt>
- introduced earlier is a short-hand for <tt>rev^{commit}</tt>.
+ dereferenced anymore (in which case, barf). <tt>rev&#94;0</tt>
+ introduced earlier is a short-hand for <tt>rev&#94;{commit}</tt>.
</p>
</li>
<li>
<p>
-A suffix <em>^</em> followed by an empty brace pair
- (e.g. <tt>v0.99.8^{}</tt>) means the object could be a tag,
+A suffix <em>&#94;</em> followed by an empty brace pair
+ (e.g. <tt>v0.99.8&#94;{}</tt>) means the object could be a tag,
and dereference the tag recursively until a non-tag object is
found.
</p>
@@ -664,11 +664,11 @@ of commits, not just a single commit. To these commands,
specifying a single revision with the notation described in the
previous section means the set of commits reachable from that
commit, following the commit ancestry chain.</p>
-<p>To exclude commits reachable from a commit, a prefix <tt>^</tt>
-notation is used. E.g. "<tt>^r1 r2</tt>" means commits reachable
+<p>To exclude commits reachable from a commit, a prefix <tt>&#94;</tt>
+notation is used. E.g. "<tt>&#94;r1 r2</tt>" means commits reachable
from <tt>r2</tt> but exclude the ones reachable from <tt>r1</tt>.</p>
<p>This set operation appears so often that there is a shorthand
-for it. "<tt>r1..r2</tt>" is equivalent to "<tt>^r1 r2</tt>". It is
+for it. "<tt>r1..r2</tt>" is equivalent to "<tt>&#94;r1 r2</tt>". It is
the difference of two sets (subtract the set of commits
reachable from <tt>r1</tt> from the set of commits reachable from
<tt>r2</tt>).</p>
@@ -678,8 +678,8 @@ of <tt>r1</tt> and <tt>r2</tt> and is defined as
It is the set of commits that are reachable from either one of
<tt>r1</tt> or <tt>r2</tt> but not from both.</p>
<p>Two other shorthands for naming a set that is formed by a commit
-and its parent commits exists. <tt>r1^@</tt> notation means all
-parents of <tt>r1</tt>. <tt>r1^!</tt> includes commit <tt>r1</tt> but excludes
+and its parent commits exists. <tt>r1&#94;@</tt> notation means all
+parents of <tt>r1</tt>. <tt>r1&#94;!</tt> includes commit <tt>r1</tt> but excludes
its all parents.</p>
<p>Here are a handful examples:</p>
<div class="literalblock">
@@ -709,7 +709,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2007 16:08:29 UTC
+Last updated 16-Jun-2007 09:49:20 UTC
</div>
</div>
</body>