summaryrefslogtreecommitdiffstats
path: root/git-rev-parse.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-07 22:10:48 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-07 22:10:48 +0000
commit15048272f145e2a7ca7c8923c4a7bc5d14bf4913 (patch)
treed5b5693c3d1e409f990de01cfe98aaa3a207f4b8 /git-rev-parse.html
parentba4b9286c25f18c7ebbb809ee5732a7810377ab6 (diff)
downloadgit-htmldocs-15048272f145e2a7ca7c8923c4a7bc5d14bf4913.tar.gz
Autogenerated HTML docs for v1.5.6.2-247-g923712
Diffstat (limited to 'git-rev-parse.html')
-rw-r--r--git-rev-parse.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html
index 54309af0a..fe70a422f 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -811,9 +811,9 @@ 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></div>
<div class="para"><p>Two other shorthands for naming a set that is formed by a commit
-and its parent commits exists. <tt>r1&#94;@</tt> notation means all
+and its parent commits exist. The <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></div>
+all of its parents.</p></div>
<div class="para"><p>Here are a handful of examples:</p></div>
<div class="literalblock">
<div class="content">
@@ -964,7 +964,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Pierre Habouzit &lt;madcoder@debian.or
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-06 05:17:00 UTC
+Last updated 2008-07-07 22:10:11 UTC
</div>
</div>
</body>