diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-07-06 19:26:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-06 19:26:13 -0700 |
| commit | bf928e9d2cf124ed73711f90666f9cee3c084e59 (patch) | |
| tree | ab031807768cac726cbd21a941b512f04be3875c /Documentation/git-rev-list.txt | |
| parent | Merge branch 'ew/instaweb' (diff) | |
| parent | builtin-rev-parse.c: constness tightening (diff) | |
| download | tgif-bf928e9d2cf124ed73711f90666f9cee3c084e59.tar.xz | |
Merge branch 'js/merge-base'
Diffstat (limited to 'Documentation/git-rev-list.txt')
| -rw-r--r-- | Documentation/git-rev-list.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index ad6d14c55a..6c370e1bef 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -15,6 +15,7 @@ SYNOPSIS [ \--sparse ] [ \--no-merges ] [ \--remove-empty ] + [ \--not ] [ \--all ] [ \--topo-order ] [ \--parents ] @@ -37,6 +38,14 @@ not in 'baz'". A special notation <commit1>..<commit2> can be used as a short-hand for {caret}<commit1> <commit2>. +Another special notation is <commit1>...<commit2> which is useful for +merges. The resulting set of commits is the symmetric difference +between the two operands. The following two commands are equivalent: + +------------ +$ git-rev-list A B --not $(git-merge-base --all A B) +$ git-rev-list A...B +------------ OPTIONS ------- @@ -93,6 +102,11 @@ OPTIONS --remove-empty:: Stop when a given path disappears from the tree. +--not:: + Reverses the meaning of the '{caret}' prefix (or lack + thereof) for all following revision specifiers, up to + the next `--not`. + --all:: Pretend as if all the refs in `$GIT_DIR/refs/` are listed on the command line as <commit>. |