diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-07 13:11:28 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-07 13:11:28 +0400 |
| commit | 585ad90c804a501415f03926c1ef67a34cb37cda (patch) | |
| tree | 8514f419d2ef9d54eeaca23065ca16376eb03c6f /Documentation/git-rev-parse.txt | |
| parent | 8c992d16cb8f964e42a733dbc60f0e3f0b47270e (diff) | |
| parent | faf466ffb1b81a6af3946645865b3a38f33cdc11 (diff) | |
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.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 0501a87025..378a3124ac 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: |