forked from mirrors/jj
Deployed f2f5ded
to prerelease with MkDocs 1.5.2 and mike 1.1.2
This commit is contained in:
parent
6c6d76486c
commit
94056f7658
5 changed files with 68 additions and 27 deletions
|
@ -606,6 +606,19 @@
|
|||
Aliases
|
||||
</a>
|
||||
|
||||
<nav class="md-nav" aria-label="Aliases">
|
||||
<ul class="md-nav__list">
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#built-in-aliases" class="md-nav__link">
|
||||
Built-in Aliases
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
|
@ -1147,6 +1160,19 @@
|
|||
Aliases
|
||||
</a>
|
||||
|
||||
<nav class="md-nav" aria-label="Aliases">
|
||||
<ul class="md-nav__list">
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#built-in-aliases" class="md-nav__link">
|
||||
Built-in Aliases
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
|
@ -1312,6 +1338,21 @@ combination of the predefined symbols/functions and other aliases.</p>
|
|||
<span class="s">'mine'</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">'author(martinvonz)'</span>
|
||||
<span class="s">'user(x)'</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">'author(x) | committer(x)'</span>
|
||||
</code></pre></div>
|
||||
<h3 id="built-in-aliases">Built-in Aliases<a class="headerlink" href="#built-in-aliases" title="Permanent link">¶</a></h3>
|
||||
<p>The following aliases are built-in and used for certain operations. These functions
|
||||
are defined as aliases in order to allow you to overwrite them as needed.
|
||||
See <a href="https://github.com/martinvonz/jj/blob/main/cli/src/config/revsets.toml">revsets.toml</a>
|
||||
for a comprehensive list.</p>
|
||||
<ul>
|
||||
<li><code>trunk()</code>: Resolves to the head commit for the trunk branch of the <code>origin</code>
|
||||
remote. The branches <code>main</code>, <code>master</code>, and <code>trunk</code> are tried in order.
|
||||
If none of the branches exist, it evaluates to <code>root()</code>.</li>
|
||||
</ul>
|
||||
<p>You can <a href="config.html">override</a> this as appropriate. If you do, make sure it
|
||||
always resolves to exactly one commit. For example:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[revset-aliases]</span>
|
||||
<span class="s">'trunk()'</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">'latest(remote_branches(exact:"your-branch", exact:"your-remote"))'</span>
|
||||
</code></pre></div>
|
||||
<h2 id="examples">Examples<a class="headerlink" href="#examples" title="Permanent link">¶</a></h2>
|
||||
<p>Show the parent(s) of the working-copy commit (like <code>git log -1 HEAD</code>):</p>
|
||||
<div class="highlight"><pre><span></span><code>jj log -r @-
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -2,127 +2,127 @@
|
|||
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/FAQ.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/branches.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/code-of-conduct.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/config.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/conflicts.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/contributing.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/git-comparison.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/git-compatibility.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/github.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/glossary.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/install-and-setup.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/operation-log.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/related-work.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/revsets.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/sapling-comparison.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/templates.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/tutorial.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/working-copy.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodule-storage.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodules.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/run.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/tracking-branches.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/architecture.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/concurrency.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/conflicts.html</loc>
|
||||
<lastmod>2023-09-16</lastmod>
|
||||
<lastmod>2023-09-17</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
</urlset>
|
Binary file not shown.
Loading…
Reference in a new issue