Skip to content

Commit

Permalink
Deployed 638649b 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 May 6, 2024
1 parent 9c1f96a commit 0c616c9
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 40 deletions.
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-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/FAQ/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/branches/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/cli-reference/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/code-of-conduct/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/config/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/conflicts/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/contributing/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/filesets/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/git-comparison/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/git-compatibility/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/github/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/glossary/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/install-and-setup/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/operation-log/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/related-work/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/revsets/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/sapling-comparison/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/templates/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/testimonials/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/tutorial/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/windows/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/working-copy/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodule-storage/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodules/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/run/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/sparse-v2/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/tracking-branches/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/architecture/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/concurrency/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/conflicts/</loc>
<lastmod>2024-05-05</lastmod>
<lastmod>2024-05-06</lastmod>
<changefreq>daily</changefreq>
</url>
</urlset>
Binary file modified prerelease/sitemap.xml.gz
View file
Binary file not shown.
27 changes: 19 additions & 8 deletions prerelease/tutorial/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1772,14 +1772,12 @@ <h2 id="moving-content-changes-between-commits">Moving content changes between c
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>mrxqplyk<span class="w"> </span>52a6c7fd<span class="w"> </span>ABCD
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>kwtuwqnm<span class="w"> </span>643061ac<span class="w"> </span>ABC
</code></pre></div>
<p>That will bring up the built-in diff editor with a diff of the changes in the
"ABCD" commit. If you prefer another diff editor, such as
<a href="https://meldmerge.org">Meld</a>, you can configure
<a href="../config/#editing-diffs"><code>ui.diff-editor</code></a> instead. Expand the file by
clicking on <code>(+)</code> or with right arrow, then select the sections/line to include
by clicking or using space. Once complete, press <code>c</code> to confirm changes, or <code>q</code>
to exit without saving. We can also click on the menu items to see more
options.</p>
<p>That will bring up the built-in diff editor<sup id="fnref:alternative_diff_editors"><a class="footnote-ref" href="#fn:alternative_diff_editors">1</a></sup> with a
diff of the changes in the "ABCD" commit. Expand the file by clicking on <code>(+)</code>
or with right arrow, then select the sections/line to include by clicking or
using space. Once complete, press <code>c</code> to confirm changes, or <code>q</code> to exit without
saving. You can also use the mouse to click on the menu items to see more
options (keyboard navigation is currently limited).</p>
<p>If we look at the diff of the second commit, we now see
that all three lines got capitalized:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>diff<span class="w"> </span>-r<span class="w"> </span>@-
Expand Down Expand Up @@ -1820,6 +1818,19 @@ <h2 id="moving-content-changes-between-commits">Moving content changes between c
unsquash -i</code>. Now that you've seen how <code>jj squash -i</code> and <code>jj diffedit</code> work,
you can hopefully figure out how those work (with the help of the instructions
in the diff).</p>
<div class="footnote">
<hr />
<ol>
<li id="fn:alternative_diff_editors">
<p>There are many other diff editors you could use.
For example, if you have <a href="https://meldmerge.org">Meld</a> installed and in the
PATH, you can use it via <code>jj squash -i --tool meld</code> or a fancier config with <code>jj
squash -i --tool meld-3</code>. You can configure the default with the
<a href="../config/#editing-diffs"><code>ui.diff-editor</code> option</a>; those docs also explain how
to specify a path to an executable if it is not in the PATH.&#160;<a class="footnote-backref" href="#fnref:alternative_diff_editors" title="Jump back to footnote 1 in the text">&#8617;</a></p>
</li>
</ol>
</div>



Expand Down

0 comments on commit 0c616c9

Please sign in to comment.