ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

Deployed aaa99e6 to prerelease with MkDocs 1.6.0 and mike 2.1.1

Browse source
This commit is contained in:
jj-docs[bot] 2024-07-04 00:10:01 +00:00
parent 0d9e204155
commit aab43be89b
4 changed files with 45 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
prerelease/config/index.html
View file

@ -2462,6 +2462,15 @@ For the tool named <code>&lt;name&gt;</code>, command arguments can be configure
<li><code>$left</code> and <code>$right</code> are replaced with the paths to the left and right
directories to diff respectively.</li>
</ul>
<p>By default <code>jj</code> will invoke external tools with a directory containing the left
and right sides. The <code>diff-invocation-mode</code> config can change this to file by file
invocations as follows:</p>
<div class="highlight"><pre><span></span><code><span class="k">[ui]</span>
<span class="n">diff</span><span class="p">.</span><span class="n">tool</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;vimdiff&quot;</span>
<span class="k">[merge-tools.vimdiff]</span>
<span class="n">diff-invocation-mode</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;file-by-file&quot;</span>
</code></pre></div>
<h3 id="set-of-immutable-commits">Set of immutable commits<a class="headerlink" href="#set-of-immutable-commits" title="Permanent link">&para;</a></h3>
<p>You can configure the set of immutable commits via <code>revset-aliases."immutable_heads()"</code>.
The default set of immutable heads is <code>trunk() | tags()</code>. For example, to

2
prerelease/search/search_index.json
View file

File diff suppressed because one or more lines are too long

70
prerelease/sitemap.xml
View file

@ -2,177 +2,177 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://martinvonz.github.io/jj/latest/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/FAQ/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/branches/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/cli-reference/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/code-of-conduct/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/community_tools/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/config/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/conflicts/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/contributing/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design_doc_blueprint/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design_docs/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/filesets/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/git-comparison/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/git-compatibility/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/github/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/glossary/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/install-and-setup/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/operation-log/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/related-work/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/revsets/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/sapling-comparison/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/templates/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/testimonials/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/tutorial/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/windows/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/working-copy/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design/copy-tracking/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design/git-submodule-storage/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design/git-submodules/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design/run/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design/sparse-v2/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design/tracking-branches/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/technical/architecture/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/technical/concurrency/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/technical/conflicts/</loc>
<lastmod>2024-07-03</lastmod>
<lastmod>2024-07-04</lastmod>
<changefreq>daily</changefreq>
</url>
</urlset>

BIN
prerelease/sitemap.xml.gz
View file

Binary file not shown.