forked from mirrors/jj
Deployed 6d78d92
to prerelease with MkDocs 1.5.3 and mike 2.0.0
This commit is contained in:
parent
612880a8dd
commit
64253bbd69
4 changed files with 32 additions and 32 deletions
|
@ -2365,7 +2365,7 @@ setting, but you could set it explicitly too.</p>
|
|||
<p>Obviously, you would only set one line, don't copy them all in!</p>
|
||||
<h2 id="editing-diffs">Editing diffs<a class="headerlink" href="#editing-diffs" title="Permanent link">¶</a></h2>
|
||||
<p>The <code>ui.diff-editor</code> setting affects the tool used for editing diffs (e.g. <code>jj
|
||||
split</code>, <code>jj amend -i</code>). The default is the special value <code>:builtin</code>, which
|
||||
split</code>, <code>jj squash -i</code>). The default is the special value <code>:builtin</code>, which
|
||||
launches a built-in TUI tool (known as <a href="https://github.com/arxanas/scm-record?tab=readme-ov-file#scm-diff-editor">scm-diff-editor</a>) to edit the diff in
|
||||
your terminal.</p>
|
||||
<p><code>jj</code> makes the following substitutions:</p>
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -2,152 +2,152 @@
|
|||
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/FAQ/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/branches/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/cli-reference/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/code-of-conduct/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/config/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/conflicts/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/contributing/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/git-comparison/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/git-compatibility/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/github/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/glossary/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/install-and-setup/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/operation-log/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/related-work/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/revsets/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/sapling-comparison/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/templates/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/testimonials/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/tutorial/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/windows/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/working-copy/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodule-storage/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodules/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/run/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/sparse-v2/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/tracking-branches/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/architecture/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/concurrency/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/conflicts/</loc>
|
||||
<lastmod>2024-03-09</lastmod>
|
||||
<lastmod>2024-03-10</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
</urlset>
|
Binary file not shown.
Loading…
Reference in a new issue