diff options
| author | Rene Scharfe <rene.scharfe@lsrfire.ath.cx> | 2006-07-02 01:29:37 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-01 18:13:47 -0700 |
| commit | 0d2c9d67d9e1a2fd87b2daeefffffaff0b3f3a49 (patch) | |
| tree | 30ea078fdd6661fa0b1f469dbc1570f41a245a93 /Documentation/git-rev-list.txt | |
| parent | 31609c17251f368584f7b94d44b06194112b4251 (diff) | |
| download | git-0d2c9d67d9e1a2fd87b2daeefffffaff0b3f3a49.tar.gz git-0d2c9d67d9e1a2fd87b2daeefffffaff0b3f3a49.tar.xz | |
Add '...' operator for revisions
'A...B' is a shortcut for 'A B --not $(git-merge-base --all A B)'.
This XOR-like operation is called symmetric difference in set
theory.
The symbol '...' has been chosen because it's rather similar to the
existing '..' operator and the somewhat more natural caret ('^') is
already taken.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 ad6d14c55..6c370e1be 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>. |