summaryrefslogtreecommitdiffstats
path: root/git-rev-parse.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-01-30 08:28:52 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-01-30 08:28:52 +0000
commit1f51196d6e5d90b427ef64b6769c2c32e1577942 (patch)
tree443121ff9a66322a51608b996b6b2e23ae6e807a /git-rev-parse.html
parente35a6fc91bc4b7cd8763e7d1d06c02d7ce22d9c1 (diff)
downloadgit-htmldocs-1f51196d6e5d90b427ef64b6769c2c32e1577942.tar.gz
Autogenerated HTML docs for v1.5.4-rc5-11-g0eab8
Diffstat (limited to 'git-rev-parse.html')
-rw-r--r--git-rev-parse.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html
index 67594b99f..c197b0c27 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -680,7 +680,7 @@ A suffix <em>:</em> followed by a path; this names the blob or tree
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. During a merge, stage
+ that follows it) names a stage 0 entry. During a merge, stage
1 is the common ancestor, stage 2 is the target branch's version
(typically the current branch), and stage 3 is the version from
the branch being merged.
@@ -688,7 +688,7 @@ A colon, optionally followed by a stage number (0 to 3) and a
</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
+commit parents of commit node A. Parent commits are ordered
left-to-right.</p>
<div class="literalblock">
<div class="content">
@@ -740,7 +740,7 @@ It is the set of commits that are reachable from either one of
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>
+<p>Here are a handful of examples:</p>
<div class="literalblock">
<div class="content">
<pre><tt>D G H D
@@ -834,7 +834,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 07-Jan-2008 07:50:44 UTC
+Last updated 30-Jan-2008 08:28:23 UTC
</div>
</div>
</body>