Skip to content

Commit

Permalink
Deployed 0c0b924 to prerelease with MkDocs 1.5.2 and mike 1.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jj-docs[bot] committed Sep 26, 2023
1 parent ad67f67 commit 2c010e7
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 28 deletions.
3 changes: 2 additions & 1 deletion prerelease/github.html
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,7 @@ <h3 id="rewriting-commits">Rewriting commits<a class="headerlink" href="#rewriti
something like this:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span><span class="c1"># Create a new commit on top of the second-to-last commit in `your-feature`,</span>
$<span class="w"> </span><span class="c1"># as reviews requested a fix there.</span>
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>your-feature-
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>your-feature-<span class="w"> </span><span class="c1"># NOTE: the trailing hyphen is not a typo!</span>
$<span class="w"> </span><span class="c1"># Address the comments by updating the code</span>
$<span class="w"> </span><span class="c1"># Review the changes</span>
$<span class="w"> </span>jj<span class="w"> </span>diff
Expand All @@ -1326,6 +1326,7 @@ <h3 id="rewriting-commits">Rewriting commits<a class="headerlink" href="#rewriti
$<span class="w"> </span><span class="c1"># Push the updated branch to the remote. Jujutsu automatically makes it a force push</span>
$<span class="w"> </span>jj<span class="w"> </span>git<span class="w"> </span>push<span class="w"> </span>--branch<span class="w"> </span>your-feature
</code></pre></div>
<p>The hyphen after <code>your-feature</code> comes from <a href="https://github.com/martinvonz/jj/blob/main/docs/revsets.md">revset</a> syntax.</p>
<h2 id="using-github-cli">Using GitHub CLI<a class="headerlink" href="#using-github-cli" title="Permanent link">&para;</a></h2>
<p>GitHub CLI will have trouble finding the proper git repository path in jj repos
that aren't <a href="git-compatibility.html#co-located-jujutsugit-repos">co-located</a>
Expand Down
2 changes: 1 addition & 1 deletion prerelease/search/search_index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion prerelease/search/search_index.json

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions prerelease/sitemap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,127 +2,127 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://martinvonz.github.io/jj/prerelease/FAQ.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/branches.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/code-of-conduct.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/config.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/conflicts.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/contributing.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/git-comparison.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/git-compatibility.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/github.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/glossary.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/install-and-setup.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/operation-log.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/related-work.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/revsets.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/sapling-comparison.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/templates.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/tutorial.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/working-copy.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodule-storage.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodules.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/run.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/tracking-branches.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/architecture.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/concurrency.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/conflicts.html</loc>
<lastmod>2023-09-25</lastmod>
<lastmod>2023-09-26</lastmod>
<changefreq>daily</changefreq>
</url>
</urlset>
Binary file modified prerelease/sitemap.xml.gz
Binary file not shown.

0 comments on commit 2c010e7

Please sign in to comment.