mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/pickaxe'

Browse Source
This commit is contained in:
Junio C Hamano
2006-11-07 16:33:59 -08:00
parent 231f240b63 7bd9641df5
commit 24ad8e0ce2
13 changed files with 2093 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/git-rev-parse.txt
View File

@ -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
------