forked from mirrors/jj
Deployed 4d08c2c
to prerelease with MkDocs 1.6.0 and mike 2.1.1
This commit is contained in:
parent
eab0bb1fc2
commit
429613e6d1
4 changed files with 179 additions and 38 deletions
|
@ -1486,18 +1486,22 @@ only symbols.</p>
|
|||
<ul>
|
||||
<li><code>x-</code>: Parents of <code>x</code>, can be empty.</li>
|
||||
<li><code>x+</code>: Children of <code>x</code>, can be empty.</li>
|
||||
<li><code>x::</code>: Descendants of <code>x</code>, including the commits in <code>x</code> itself.</li>
|
||||
<li><code>x..</code>: Revisions that are not ancestors of <code>x</code>.</li>
|
||||
<li><code>::x</code>: Ancestors of <code>x</code>, including the commits in <code>x</code> itself.</li>
|
||||
<li><code>x::</code>: Descendants of <code>x</code>, including the commits in <code>x</code> itself. Shorthand for
|
||||
<code>x::visible_heads()</code>.</li>
|
||||
<li><code>x..</code>: Revisions that are not ancestors of <code>x</code>. Shorthand for
|
||||
<code>x..visible_heads()</code>.</li>
|
||||
<li><code>::x</code>: Ancestors of <code>x</code>, including the commits in <code>x</code> itself. Shorthand for
|
||||
<code>root()::x</code>.</li>
|
||||
<li><code>..x</code>: Ancestors of <code>x</code>, including the commits in <code>x</code> itself, but excluding
|
||||
the root commit. Equivalent to <code>::x ~ root()</code>.</li>
|
||||
the root commit. Shorthand for <code>root()..x</code>. Equivalent to <code>::x ~ root()</code>.</li>
|
||||
<li><code>x::y</code>: Descendants of <code>x</code> that are also ancestors of <code>y</code>. Equivalent
|
||||
to <code>x:: & ::y</code>. This is what <code>git log</code> calls <code>--ancestry-path x..y</code>.</li>
|
||||
<li><code>x..y</code>: Ancestors of <code>y</code> that are not also ancestors of <code>x</code>. Equivalent to
|
||||
<code>::y ~ ::x</code>. This is what <code>git log</code> calls <code>x..y</code> (i.e. the same as we call it).</li>
|
||||
<li><code>::</code>: All visible commits in the repo. Equivalent to <code>all()</code>.</li>
|
||||
<li><code>::</code>: All visible commits in the repo. Shorthand for
|
||||
<code>root()::visible_heads()</code>. Equivalent to <code>all()</code>.</li>
|
||||
<li><code>..</code>: All visible commits in the repo, but excluding the root commit.
|
||||
Equivalent to <code>~root()</code>.</li>
|
||||
Shorthand for <code>root()..visible_heads()</code>. Equivalent to <code>~root()</code>.</li>
|
||||
<li><code>~x</code>: Revisions that are not in <code>x</code>.</li>
|
||||
<li><code>x & y</code>: Revisions that are in both <code>x</code> and <code>y</code>.</li>
|
||||
<li><code>x ~ y</code>: Revisions that are in <code>x</code> but not in <code>y</code>.</li>
|
||||
|
@ -1506,6 +1510,143 @@ only symbols.</p>
|
|||
<p>(listed in order of binding strengths)</p>
|
||||
<p>You can use parentheses to control evaluation order, such as <code>(x & y) | z</code> or
|
||||
<code>x & (y | z)</code>.</p>
|
||||
<details>
|
||||
<summary>Examples:</summary>
|
||||
|
||||
Given this history:
|
||||
<div class="highlight"><pre><span></span><code>D
|
||||
|\
|
||||
| o C
|
||||
| |
|
||||
o | B
|
||||
|/
|
||||
o A
|
||||
|
|
||||
o root()
|
||||
</code></pre></div>
|
||||
|
||||
**Operator** `x-`
|
||||
|
||||
`D-` ⇒ `{C,B}`
|
||||
|
||||
`B-` ⇒ `{A}`
|
||||
|
||||
`A-` ⇒ `{root()}`
|
||||
|
||||
`root()-` ⇒ `{}` (empty set)
|
||||
|
||||
`none()-` ⇒ `{}` (empty set)
|
||||
|
||||
`(D|A)-` ⇒ `{C,B,root()}`
|
||||
|
||||
`(C|B)-` ⇒ `{A}`
|
||||
|
||||
**Operator** `x+`
|
||||
|
||||
`D+` ⇒ `{}` (empty set)
|
||||
|
||||
`B+` ⇒ `{D}`
|
||||
|
||||
`A+` ⇒ `{B,C}`
|
||||
|
||||
`root()+` ⇒ `{A}`
|
||||
|
||||
`none()+` ⇒ `{}` (empty set)
|
||||
|
||||
`(C|B)+` ⇒ `{D}`
|
||||
|
||||
`(B|root())+` ⇒ `{D,A}`
|
||||
|
||||
**Operator** `x::`
|
||||
|
||||
`D::` ⇒ `{D}`
|
||||
|
||||
`B::` ⇒ `{D,B}`
|
||||
|
||||
`A::` ⇒ `{D,C,B,A}`
|
||||
|
||||
`root()::` ⇒ `{D,C,B,A,root()}`
|
||||
|
||||
`::none()` ⇒ `{}` (empty set)
|
||||
|
||||
`(C|B)::` ⇒ `{D,C,B}`
|
||||
|
||||
**Operator** `x..`
|
||||
|
||||
`D..` ⇒ `{}` (empty set)
|
||||
|
||||
`B..` ⇒ `{D,C}` (note that, unlike `B::`, this includes `C`)
|
||||
|
||||
`A..` ⇒ `{D,C,B}`
|
||||
|
||||
`root()..` ⇒ `{D,C,B,A}`
|
||||
|
||||
`none()..` ⇒ `{D,C,B,A,root()}`
|
||||
|
||||
`(C|B)..` ⇒ `{D}`
|
||||
|
||||
**Operator** `::x`
|
||||
|
||||
`::D` ⇒ `{D,C,B,A,root()}`
|
||||
|
||||
`::B` ⇒ `{B,A,root()}`
|
||||
|
||||
`::A` ⇒ `{A,root()}`
|
||||
|
||||
`::root()` ⇒ `{root()}`
|
||||
|
||||
`::none()` ⇒ `{}` (empty set)
|
||||
|
||||
`::(C|B)` ⇒ `{C,B,A,root()}`
|
||||
|
||||
**Operator** `..x`
|
||||
|
||||
`..D` ⇒ `{D,C,B,A}`
|
||||
|
||||
`..B` ⇒ `{B,A}`
|
||||
|
||||
`..A` ⇒ `{A}`
|
||||
|
||||
`..root()` ⇒ `{}` (empty set)
|
||||
|
||||
`..none()` ⇒ `{}` (empty set)
|
||||
|
||||
`..(C|B)` ⇒ `{C,B,A}`
|
||||
|
||||
**Operator** `x::y`
|
||||
|
||||
`D::D` ⇒ `{D}`
|
||||
|
||||
`B::D` ⇒ `{D,B}` (note that, unlike `B..D`, this includes `B` and excludes `C`)
|
||||
|
||||
`A::D` ⇒ `{D,C,B,A}`
|
||||
|
||||
`root()::D` ⇒ `{D,C,B,A,root()}`
|
||||
|
||||
`none()::D` ⇒ `{}` (empty set)
|
||||
|
||||
`D::B` ⇒ `{}` (empty set)
|
||||
|
||||
`(C|B)::(C|B)` ⇒ `{C,B}`
|
||||
|
||||
**Operator** `x..y`
|
||||
|
||||
`D..D` ⇒ `{}` (empty set)
|
||||
|
||||
`B..D` ⇒ `{D,C}` (note that, unlike `B::D`, this includes `C` and excludes `B`)
|
||||
|
||||
`A..D` ⇒ `{D,C,B}`
|
||||
|
||||
`root()..D` ⇒ `{D,C,B,A}`
|
||||
|
||||
`none()..D` ⇒ `{D,C,B,A,root()}`
|
||||
|
||||
`D..B` ⇒ `{}` (empty set)
|
||||
|
||||
`(C|B)..(C|B)` ⇒ `{}` (empty set)
|
||||
|
||||
</details>
|
||||
|
||||
<h2 id="functions">Functions<a class="headerlink" href="#functions" title="Permanent link">¶</a></h2>
|
||||
<p>You can also specify revisions by using functions. Some functions take other
|
||||
revsets (expressions) as arguments.</p>
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -2,157 +2,157 @@
|
|||
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/FAQ/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/branches/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/cli-reference/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/code-of-conduct/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/config/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/conflicts/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/contributing/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/filesets/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/git-comparison/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/git-compatibility/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/github/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/glossary/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/install-and-setup/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/operation-log/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/related-work/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/revsets/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/sapling-comparison/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/templates/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/testimonials/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/tutorial/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/windows/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/working-copy/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/git-submodule-storage/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/git-submodules/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/run/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/sparse-v2/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/tracking-branches/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/technical/architecture/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/technical/concurrency/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/technical/conflicts/</loc>
|
||||
<lastmod>2024-06-16</lastmod>
|
||||
<lastmod>2024-06-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
</urlset>
|
Binary file not shown.
Loading…
Reference in a new issue