ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

Deployed 0e2e09a to prerelease with MkDocs 1.5.3 and mike 2.0.0

Browse source
This commit is contained in:
jj-docs[bot] 2024-04-29 06:19:39 +00:00
parent bff4ccb782
commit b91a441998
5 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
prerelease/cli-reference/index.html
View file

@ -6784,13 +6784,15 @@ J J
</code></pre></div>
<p>If a working-copy commit gets abandoned, it will be given a new, empty
commit. This is true in general; it is not specific to this command.</p>
<p><strong>Usage:</strong> <code>jj rebase [OPTIONS] --destination &lt;DESTINATION&gt;</code></p>
<p><strong>Usage:</strong> <code>jj rebase [OPTIONS] &lt;--destination &lt;DESTINATION&gt;|--insert-after &lt;INSERT_AFTER&gt;|--insert-before &lt;INSERT_BEFORE&gt;&gt;</code></p>
<h6 id="options_36"><strong>Options:</strong><a class="headerlink" href="#options_36" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-b</code>, <code>--branch &lt;BRANCH&gt;</code> — Rebase the whole branch relative to destination's ancestors (can be repeated)</li>
<li><code>-s</code>, <code>--source &lt;SOURCE&gt;</code> — Rebase specified revision(s) together with their trees of descendants (can be repeated)</li>
<li><code>-r</code>, <code>--revisions &lt;REVISIONS&gt;</code> — Rebase the given revisions, rebasing descendants onto this revision's parent(s)</li>
<li><code>-d</code>, <code>--destination &lt;DESTINATION&gt;</code> — The revision(s) to rebase onto (can be repeated to create a merge commit)</li>
<li><code>-A</code>, <code>--insert-after &lt;INSERT_AFTER&gt;</code> — The revision(s) to insert after (can be repeated to create a merge commit)</li>
<li><code>-B</code>, <code>--insert-before &lt;INSERT_BEFORE&gt;</code> — The revision(s) to insert before (can be repeated to create a merge commit)</li>
<li>
<p><code>--skip-empty</code> — If true, when rebasing would produce an empty commit, the commit is abandoned. It will not be abandoned if it was already empty before the rebase. Will never skip merge commits with multiple non-empty parents</p>
<p>Possible values: <code>true</code>, <code>false</code></p>

3
prerelease/git-comparison/index.html
View file

@ -1594,8 +1594,7 @@ parent.</p>
</tr>
<tr>
<td>Reorder changes from A-B-C-D to A-C-B-D</td>
<td><code>jj rebase -r C -d A; jj rebase -s B -d C</code> (pass change IDs,
not commit IDs, to not have to look up commit ID of rewritten C)</td>
<td><code>jj rebase -r C --before B</code></td>
<td><code>git rebase -i A</code></td>
</tr>
<tr>

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-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/FAQ/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/branches/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/cli-reference/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/code-of-conduct/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/config/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/conflicts/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/contributing/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/filesets/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/git-comparison/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/git-compatibility/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/github/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/glossary/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/install-and-setup/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/operation-log/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/related-work/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/revsets/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/sapling-comparison/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/templates/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/testimonials/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/tutorial/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/windows/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/working-copy/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodule-storage/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodules/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/run/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/sparse-v2/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/tracking-branches/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/architecture/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/concurrency/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/conflicts/</loc>
<lastmod>2024-04-28</lastmod>
<lastmod>2024-04-29</lastmod>
<changefreq>daily</changefreq>
</url>
</urlset>

BIN
prerelease/sitemap.xml.gz
View file

Binary file not shown.