cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-28 18:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deployed 82c85ba to prerelease with MkDocs 1.5.3 and mike 2.0.0

Browse Source
This commit is contained in:
jj-docs[bot] 2024-04-13 04:47:49 +00:00
parent 9a54548aa0
commit 81aad7c177
4 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
prerelease/cli-reference/index.html
View File

@ -6101,8 +6101,8 @@ Martin von Zweigbergk</p>
</ul>
<h2 id="jj-diffedit"><code>jj diffedit</code><a class="headerlink" href="#jj-diffedit" title="Permanent link">&para;</a></h2>
<p>Touch up the content changes in a revision with a diff editor</p>
<p>With the <code>-r</code> option, which is the default, starts a diff editor (<code>meld</code> by default) on the changes in the revision.</p>
<p>With the <code>--from</code> and/or <code>--to</code> options, starts a diff editor comparing the "from" revision to the "to" revision.</p>
<p>With the <code>-r</code> option, which is the default, starts a <a href="https://martinvonz.github.io/jj/latest/config/#editing-diffs">diff editor</a> on the changes in the revision.</p>
<p>With the <code>--from</code> and/or <code>--to</code> options, starts a <a href="https://martinvonz.github.io/jj/latest/config/#editing-diffs">diff editor</a> comparing the "from" revision to the "to" revision.</p>
<p>Edit the right side of the diff until it looks the way you want. Once you close the editor, the revision specified with <code>-r</code> or <code>--to</code> will be updated. Descendants will be rebased on top as usual, which may result in conflicts.</p>
<p>See <code>jj restore</code> if you want to move entire files from one revision to another. See <code>jj squash -i</code> or <code>jj unsquash -i</code> if you instead want to move changes into or out of the parent revision.</p>
<p><strong>Usage:</strong> <code>jj diffedit [OPTIONS]</code></p>
@ -6919,7 +6919,7 @@ commit. This is true in general; it is not specific to this command.</p>
<p><strong>Usage:</strong> <code>jj sparse edit</code></p>
<h2 id="jj-split"><code>jj split</code><a class="headerlink" href="#jj-split" title="Permanent link">&para;</a></h2>
<p>Split a revision in two</p>
<p>Starts a diff editor (<code>meld</code> by default) on the changes in the revision. Edit the right side of the diff until it has the content you want in the first revision. Once you close the editor, your edited content will replace the previous revision. The remaining changes will be put in a new revision on top.</p>
<p>Starts a <a href="https://martinvonz.github.io/jj/latest/config/#editing-diffs">diff editor</a> on the changes in the revision. Edit the right side of the diff until it has the content you want in the first revision. Once you close the editor, your edited content will replace the previous revision. The remaining changes will be put in a new revision on top.</p>
<p>If the change you split had a description, you will be asked to enter a change description for each commit. If the change did not have a description, the second part will not get a description, and you will be asked for a description only for the first part.</p>
<p><strong>Usage:</strong> <code>jj split [OPTIONS] [PATHS]...</code></p>
<h6 id="arguments_39"><strong>Arguments:</strong><a class="headerlink" href="#arguments_39" title="Permanent link">&para;</a></h6>

2
prerelease/search/search_index.json
View File

File diff suppressed because one or more lines are too long

62
prerelease/sitemap.xml
View File

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

BIN
prerelease/sitemap.xml.gz
View File

Binary file not shown.