summaryrefslogtreecommitdiff
path: root/Documentation/git-rev-parse.txt
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2008-01-29 19:38:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-30 06:00:34 (GMT)
commita5d86f7406ecda78b44faf9ab50b7c6e419dba9d (patch)
tree287998eb9b1401c65f4e35e149d9f644ca467ca7 /Documentation/git-rev-parse.txt
parentbda3a31cc7982a7ef8ddb5137359d27c3c75ebed (diff)
downloadgit-a5d86f7406ecda78b44faf9ab50b7c6e419dba9d.zip
git-a5d86f7406ecda78b44faf9ab50b7c6e419dba9d.tar.gz
git-a5d86f7406ecda78b44faf9ab50b7c6e419dba9d.tar.bz2
fix doc typos
Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rev-parse.txt')
-rw-r--r--Documentation/git-rev-parse.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 5d9c369..af98882 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -229,13 +229,13 @@ blobs contained in a commit.
* 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.
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.
G H I J
@@ -291,7 +291,7 @@ and its parent commits exists. `r1{caret}@` notation means all
parents of `r1`. `r1{caret}!` includes commit `r1` but excludes
its all parents.
-Here are a handful examples:
+Here are a handful of examples:
D G H D
D F G H I J D F