diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-07 16:33:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-07 16:33:59 -0800 |
| commit | 24ad8e0ce23d08d28a5d664ab6164b10125146ce (patch) | |
| tree | edcba1269b22d79a04558b83f47617f3ecc2acd0 /Documentation/git-rev-parse.txt | |
| parent | 231f240b63bd6cb1313e8952448b3d5b9d2fdf26 (diff) | |
| parent | 7bd9641df5b7cca91b21bfdc587962c59700786c (diff) | |
| download | git-24ad8e0ce23d08d28a5d664ab6164b10125146ce.tar.gz | |
Merge branch 'jc/pickaxe'
Diffstat (limited to 'Documentation/git-rev-parse.txt')
| -rw-r--r-- | Documentation/git-rev-parse.txt | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index ed938aafb0..4eaf5a0d1e 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -239,14 +239,21 @@ of `r1` and `r2` and is defined as It it the set of commits that are reachable from either one of `r1` or `r2` but not from both. -Here are a few examples: +Two other shorthands for naming a set that is formed by a commit +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: D A B D D F A B C D F - ^A G B D + ^A G B D ^A F B C F G...I C D F G I - ^B G I C D F G I + ^B G I C D F G I + F^@ A B C + F^! H D F H Author ------ |