Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 7 Jul 2008 09:11:28 +0000
(
02:11
-0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 7 Jul 2008 09:11:28 +0000
(
02:11
-0700)
* maint:
Fix grammar in git-rev-parse(1).
Documentation/git-rev-parse.txt
patch
|
blob
|
history
raw
(from parent 1:
8c992d1
)
diff --git
a/Documentation/git-rev-parse.txt
b/Documentation/git-rev-parse.txt
index 0501a87025c6421005ddf2bbf674b24704c360e3..378a3124acdbc96a9efbe06c253f1fd561cf3d7e 100644
(file)
--- 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 exist
s.
`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: