diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-03-18 01:54:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-03-18 01:54:48 +0000 |
| commit | ea82cff53ef3184e59a2e9e334f99284248e8b35 (patch) | |
| tree | 772babff00e6437b22c2096d0b22c39eed6e3951 /git-rev-parse.html | |
| parent | 064b4ab54285c3775f9f7a98235a28b0becfcebb (diff) | |
| download | git-htmldocs-ea82cff53ef3184e59a2e9e334f99284248e8b35.tar.gz | |
Autogenerated HTML docs for v1.6.2.1-147-g642d0
Diffstat (limited to 'git-rev-parse.html')
| -rw-r--r-- | git-rev-parse.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html index 6221e79f0..6a620630c 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -814,16 +814,16 @@ 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.</p></div>
<div class="para"><p>To exclude commits reachable from a commit, a prefix <tt>^</tt>
-notation is used. E.g. "<tt>^r1 r2</tt>" means commits reachable
+notation is used. E.g. <tt>^r1 r2</tt> means commits reachable
from <tt>r2</tt> but exclude the ones reachable from <tt>r1</tt>.</p></div>
<div class="para"><p>This set operation appears so often that there is a shorthand
for it. When you have two commits <tt>r1</tt> and <tt>r2</tt> (named according
to the syntax explained in SPECIFYING REVISIONS above), you can ask
for commits that are reachable from r2 excluding those that are reachable
-from r1 by "<tt>^r1 r2</tt>" and it can be written as "<tt>r1..r2</tt>".</p></div>
-<div class="para"><p>A similar notation "<tt>r1...r2</tt>" is called symmetric difference
+from r1 by <tt>^r1 r2</tt> and it can be written as <tt>r1..r2</tt>.</p></div>
+<div class="para"><p>A similar notation <tt>r1...r2</tt> is called symmetric difference
of <tt>r1</tt> and <tt>r2</tt> and is defined as
-"<tt>r1 r2 --not $(git merge-base --all r1 r2)</tt>".
+<tt>r1 r2 --not $(git merge-base --all r1 r2)</tt>.
It is the set of commits that are reachable from either one of
<tt>r1</tt> or <tt>r2</tt> but not from both.</p></div>
<div class="para"><p>Two other shorthands for naming a set that is formed by a commit
@@ -980,7 +980,7 @@ Junio C Hamano <gitster@pobox.com> and Pierre Habouzit <madcoder@debian </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-02-14 08:18:33 UTC
+Last updated 2009-03-18 01:54:22 UTC
</div>
</div>
</body>
|