Skip to content

Commit

Permalink
Deployed 82c85ba to prerelease with MkDocs 1.5.3 and mike 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jj-docs[bot] committed Apr 13, 2024
1 parent 9a54548 commit 81aad7c
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 35 deletions.
6 changes: 3 additions & 3 deletions prerelease/cli-reference/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6101,8 +6101,8 @@ <h6 id="options_16"><strong>Options:</strong><a class="headerlink" href="#option
</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>
Expand Down Expand Up @@ -6919,7 +6919,7 @@ <h2 id="jj-sparse-edit"><code>jj sparse edit</code><a class="headerlink" href="#
<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>
Expand Down
2 changes: 1 addition & 1 deletion prerelease/search/search_index.json
View file

Large diffs are not rendered by default.

62 changes: 31 additions & 31 deletions prerelease/sitemap.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Binary file modified prerelease/sitemap.xml.gz
View file
Binary file not shown.

0 comments on commit 81aad7c

Please sign in to comment.