From 872c568388d14f80e8d2871301dcb1a2abf04119 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 7 Jul 2006 06:05:40 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.1-gbe4c7 --- git-rev-list.html | 21 ++++++++++++++++++++- git-rev-list.txt | 14 ++++++++++++++ git-rev-parse.html | 42 +++++++++++++++++++++++++++++++++-------- git-rev-parse.txt | 45 ++++++++++++++++++++++++++++++++++++-------- git-show-branch.html | 12 +++++++++++- git-show-branch.txt | 5 +++++ 6 files changed, 121 insertions(+), 18 deletions(-) diff --git a/git-rev-list.html b/git-rev-list.html index 98ad84e8b..21a1b1747 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -279,6 +279,7 @@ git-rev-list(1) Manual Page [ --sparse ] [ --no-merges ] [ --remove-empty ] + [ --not ] [ --all ] [ --topo-order ] [ --parents ] @@ -298,6 +299,14 @@ means "list all the commits which are included in foo and bar, not in baz".

A special notation <commit1>..<commit2> can be used as a short-hand for ^<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

@@ -406,6 +415,16 @@ short-hand for ^<commit1> <commit2>.

+--not +
+
+

+ Reverses the meaning of the ^ prefix (or lack + thereof) for all following revision specifiers, up to + the next --not. +

+
+
--all
@@ -441,7 +460,7 @@ short-hand for ^<commit1> <commit2>.

diff --git a/git-rev-list.txt b/git-rev-list.txt index ad6d14c55..6c370e1be 100644 --- a/git-rev-list.txt +++ b/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 .. can be used as a short-hand for {caret} . +Another special notation is ... 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 . diff --git a/git-rev-parse.html b/git-rev-parse.html index 7489c9cb6..7c7e75323 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -539,10 +539,6 @@ A suffix ^ followed by an empty brace pair

-

git-rev-parse also accepts a prefix ^ to revision parameter, -which is passed to git-rev-list. Two revision parameters -concatenated with .. is a short-hand for writing a range -between them. I.e. r1..r2 is equivalent to saying ^r1 r2

Here is an illustration, by Jon Loeliger. Both node B and C are a commit parents of commit node A. Parent commits are ordered left-to-right.

@@ -551,9 +547,8 @@ left-to-right.

G   H   I   J
  \ /     \ /
   D   E   F
-   \  |  /
-    \ | /
-     \|/
+   \  |  /         \ | /   |
+     \|/    |
       B     C
        \   /
         \ /
@@ -573,6 +568,37 @@ I = F^   = B^3^    = A^^3^
 J = F^2  = B^3^2   = A^^3^2
+

SPECIFYING RANGES

+
+

History traversing commands such as git-log operate on a set +of commits, not just a single commit. To these commands, +specifying a single revision with the notation described in the +previous section means the set of commits reachable from that +commit, following the commit ancestry chain.

+

To exclude commits reachable from a commit, a prefix ^ +notation is used. E.g. "^r1 r2" means commits reachable +from r2 but exclude the ones reachable from r1.

+

This set operation appears so often that there is a shorthand +for it. "r1..r2" is equivalent to "^r1 r2". It is +the difference of two sets (subtract the set of commits +reachable from r1 from the set of commits reachable from +r2).

+

A similar notation "r1...r2" is called symmetric difference +of r1 and r2 and is defined as +"r1 r2 --not $(git-merge-base --all r1 r2)". +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:

+
+
+
D                A B D
+D F              A B C D F
+^A G             B D
+^A F             B C F
+G...I            C D F G I
+^B G I           C D F G I
+
+

Author

Written by Linus Torvalds <torvalds@osdl.org> and @@ -588,7 +614,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 627cde852..b761b4b96 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -156,11 +156,6 @@ syntax. and dereference the tag recursively until a non-tag object is found. -'git-rev-parse' also accepts a prefix '{caret}' to revision parameter, -which is passed to 'git-rev-list'. Two revision parameters -concatenated with '..' is a short-hand for writing a range -between them. I.e. 'r1..r2' is equivalent to saying '{caret}r1 r2' - Here is an illustration, by Jon Loeliger. Both node B and C are a commit parents of commit node A. Parent commits are ordered left-to-right. @@ -168,9 +163,9 @@ left-to-right. G H I J \ / \ / D E F - \ | / - \ | / - \|/ + \ | / \ + \ | / | + \|/ | B C \ / \ / @@ -188,6 +183,40 @@ left-to-right. J = F^2 = B^3^2 = A^^3^2 +SPECIFYING RANGES +----------------- + +History traversing commands such as `git-log` operate on a set +of commits, not just a single commit. To these commands, +specifying a single revision with the notation described in the +previous section means the set of commits reachable from that +commit, following the commit ancestry chain. + +To exclude commits reachable from a commit, a prefix `{caret}` +notation is used. E.g. "`{caret}r1 r2`" means commits reachable +from `r2` but exclude the ones reachable from `r1`. + +This set operation appears so often that there is a shorthand +for it. "`r1..r2`" is equivalent to "`{caret}r1 r2`". It is +the difference of two sets (subtract the set of commits +reachable from `r1` from the set of commits reachable from +`r2`). + +A similar notation "`r1\...r2`" is called symmetric difference +of `r1` and `r2` and is defined as +"`r1 r2 --not $(git-merge-base --all r1 r2)`". +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: + + D A B D + D F A B C D F + ^A G B D + ^A F B C F + G...I C D F G I + ^B G I C D F G I + Author ------ Written by Linus Torvalds and diff --git a/git-show-branch.html b/git-show-branch.html index fa5d322b8..b4026ceb8 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -340,6 +340,16 @@ no <rev> nor <glob> is given on the command line.

+--sparse +
+
+

+ By default, the output omits merges that are reachable + from only one tip being shown. This option makes them + visible. +

+
+
--more=<n>
@@ -470,7 +480,7 @@ your topic branch, it is shown as well.

diff --git a/git-show-branch.txt b/git-show-branch.txt index f115b45ef..a2445a48f 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt @@ -52,6 +52,11 @@ OPTIONS appear in topological order (i.e., descendant commits are shown before their parents). +--sparse:: + By default, the output omits merges that are reachable + from only one tip being shown. This option makes them + visible. + --more=:: Usually the command stops output upon showing the commit that is the common ancestor of all the branches. This -- 2.26.2