summaryrefslogtreecommitdiff
path: root/Documentation/git-rev-parse.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-07 09:11:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-07 09:11:28 (GMT)
commit585ad90c804a501415f03926c1ef67a34cb37cda (patch)
tree8514f419d2ef9d54eeaca23065ca16376eb03c6f /Documentation/git-rev-parse.txt
parent8c992d16cb8f964e42a733dbc60f0e3f0b47270e (diff)
parentfaf466ffb1b81a6af3946645865b3a38f33cdc11 (diff)
downloadgit-585ad90c804a501415f03926c1ef67a34cb37cda.zip
git-585ad90c804a501415f03926c1ef67a34cb37cda.tar.gz
git-585ad90c804a501415f03926c1ef67a34cb37cda.tar.bz2
Merge branch 'maint'
* maint: Fix grammar in git-rev-parse(1).
Diffstat (limited to 'Documentation/git-rev-parse.txt')
-rw-r--r--Documentation/git-rev-parse.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 0501a87..378a312 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -301,9 +301,9 @@ It is the set of commits that are reachable from either one of
`r1` or `r2` but not from both.
Two other shorthands for naming a set that is formed by a commit
-and its parent commits exists. `r1{caret}@` notation means all
+and its parent commits exist. The `r1{caret}@` notation means all
parents of `r1`. `r1{caret}!` includes commit `r1` but excludes
-its all parents.
+all of its parents.
Here are a handful of examples: