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

Deployed 3050685 to prerelease with MkDocs 1.6.0 and mike 2.1.1

Browse source
This commit is contained in:
jj-docs[bot] 2024-06-04 19:28:51 +00:00
parent 9e0f732630
commit 328963b3fd
6 changed files with 477 additions and 246 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

239
main/cli-reference/index.html
View file

@ -1253,6 +1253,30 @@
</ul>
</nav>
</li>
<li class="md-nav__item">
<a href="#jj-fix" class="md-nav__link">
<span class="md-ellipsis">
jj fix
</span>
</a>
<nav class="md-nav" aria-label="jj fix">
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_21" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
</a>
</li>
</ul>
</nav>
</li>
<li class="md-nav__item">
@ -1404,7 +1428,7 @@
</li>
<li class="md-nav__item">
<a href="#options_21" class="md-nav__link">
<a href="#options_22" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1428,7 +1452,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_22" class="md-nav__link">
<a href="#options_23" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1461,7 +1485,7 @@
</li>
<li class="md-nav__item">
<a href="#options_23" class="md-nav__link">
<a href="#options_24" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1485,7 +1509,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_24" class="md-nav__link">
<a href="#options_25" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1536,7 +1560,7 @@
</li>
<li class="md-nav__item">
<a href="#options_25" class="md-nav__link">
<a href="#options_26" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1569,7 +1593,7 @@
</li>
<li class="md-nav__item">
<a href="#options_26" class="md-nav__link">
<a href="#options_27" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1602,7 +1626,7 @@
</li>
<li class="md-nav__item">
<a href="#options_27" class="md-nav__link">
<a href="#options_28" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1635,7 +1659,7 @@
</li>
<li class="md-nav__item">
<a href="#options_28" class="md-nav__link">
<a href="#options_29" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1668,7 +1692,7 @@
</li>
<li class="md-nav__item">
<a href="#options_29" class="md-nav__link">
<a href="#options_30" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1692,7 +1716,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_30" class="md-nav__link">
<a href="#options_31" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1764,7 +1788,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_31" class="md-nav__link">
<a href="#options_32" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1797,7 +1821,7 @@
</li>
<li class="md-nav__item">
<a href="#options_32" class="md-nav__link">
<a href="#options_33" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1830,7 +1854,7 @@
</li>
<li class="md-nav__item">
<a href="#options_33" class="md-nav__link">
<a href="#options_34" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1887,7 +1911,7 @@
</li>
<li class="md-nav__item">
<a href="#options_34" class="md-nav__link">
<a href="#options_35" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1911,7 +1935,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_35" class="md-nav__link">
<a href="#options_36" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1944,7 +1968,7 @@
</li>
<li class="md-nav__item">
<a href="#options_36" class="md-nav__link">
<a href="#options_37" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1977,7 +2001,7 @@
</li>
<li class="md-nav__item">
<a href="#options_37" class="md-nav__link">
<a href="#options_38" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2019,7 +2043,7 @@
</li>
<li class="md-nav__item">
<a href="#options_38" class="md-nav__link">
<a href="#options_39" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2076,7 +2100,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_39" class="md-nav__link">
<a href="#options_40" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2127,7 +2151,7 @@
</li>
<li class="md-nav__item">
<a href="#options_40" class="md-nav__link">
<a href="#options_41" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2160,7 +2184,7 @@
</li>
<li class="md-nav__item">
<a href="#options_41" class="md-nav__link">
<a href="#options_42" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2241,7 +2265,7 @@
</li>
<li class="md-nav__item">
<a href="#options_42" class="md-nav__link">
<a href="#options_43" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2298,7 +2322,7 @@
</li>
<li class="md-nav__item">
<a href="#options_43" class="md-nav__link">
<a href="#options_44" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2322,7 +2346,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_44" class="md-nav__link">
<a href="#options_45" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2382,7 +2406,7 @@
</li>
<li class="md-nav__item">
<a href="#options_45" class="md-nav__link">
<a href="#options_46" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2406,7 +2430,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_46" class="md-nav__link">
<a href="#options_47" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2496,7 +2520,7 @@
</li>
<li class="md-nav__item">
<a href="#options_47" class="md-nav__link">
<a href="#options_48" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4148,6 +4172,30 @@
</ul>
</nav>
</li>
<li class="md-nav__item">
<a href="#jj-fix" class="md-nav__link">
<span class="md-ellipsis">
jj fix
</span>
</a>
<nav class="md-nav" aria-label="jj fix">
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_21" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
</a>
</li>
</ul>
</nav>
</li>
<li class="md-nav__item">
@ -4299,7 +4347,7 @@
</li>
<li class="md-nav__item">
<a href="#options_21" class="md-nav__link">
<a href="#options_22" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4323,7 +4371,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_22" class="md-nav__link">
<a href="#options_23" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4356,7 +4404,7 @@
</li>
<li class="md-nav__item">
<a href="#options_23" class="md-nav__link">
<a href="#options_24" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4380,7 +4428,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_24" class="md-nav__link">
<a href="#options_25" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4431,7 +4479,7 @@
</li>
<li class="md-nav__item">
<a href="#options_25" class="md-nav__link">
<a href="#options_26" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4464,7 +4512,7 @@
</li>
<li class="md-nav__item">
<a href="#options_26" class="md-nav__link">
<a href="#options_27" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4497,7 +4545,7 @@
</li>
<li class="md-nav__item">
<a href="#options_27" class="md-nav__link">
<a href="#options_28" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4530,7 +4578,7 @@
</li>
<li class="md-nav__item">
<a href="#options_28" class="md-nav__link">
<a href="#options_29" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4563,7 +4611,7 @@
</li>
<li class="md-nav__item">
<a href="#options_29" class="md-nav__link">
<a href="#options_30" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4587,7 +4635,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_30" class="md-nav__link">
<a href="#options_31" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4659,7 +4707,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_31" class="md-nav__link">
<a href="#options_32" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4692,7 +4740,7 @@
</li>
<li class="md-nav__item">
<a href="#options_32" class="md-nav__link">
<a href="#options_33" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4725,7 +4773,7 @@
</li>
<li class="md-nav__item">
<a href="#options_33" class="md-nav__link">
<a href="#options_34" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4782,7 +4830,7 @@
</li>
<li class="md-nav__item">
<a href="#options_34" class="md-nav__link">
<a href="#options_35" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4806,7 +4854,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_35" class="md-nav__link">
<a href="#options_36" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4839,7 +4887,7 @@
</li>
<li class="md-nav__item">
<a href="#options_36" class="md-nav__link">
<a href="#options_37" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4872,7 +4920,7 @@
</li>
<li class="md-nav__item">
<a href="#options_37" class="md-nav__link">
<a href="#options_38" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4914,7 +4962,7 @@
</li>
<li class="md-nav__item">
<a href="#options_38" class="md-nav__link">
<a href="#options_39" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4971,7 +5019,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_39" class="md-nav__link">
<a href="#options_40" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5022,7 +5070,7 @@
</li>
<li class="md-nav__item">
<a href="#options_40" class="md-nav__link">
<a href="#options_41" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5055,7 +5103,7 @@
</li>
<li class="md-nav__item">
<a href="#options_41" class="md-nav__link">
<a href="#options_42" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5136,7 +5184,7 @@
</li>
<li class="md-nav__item">
<a href="#options_42" class="md-nav__link">
<a href="#options_43" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5193,7 +5241,7 @@
</li>
<li class="md-nav__item">
<a href="#options_43" class="md-nav__link">
<a href="#options_44" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5217,7 +5265,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_44" class="md-nav__link">
<a href="#options_45" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5277,7 +5325,7 @@
</li>
<li class="md-nav__item">
<a href="#options_45" class="md-nav__link">
<a href="#options_46" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5301,7 +5349,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_46" class="md-nav__link">
<a href="#options_47" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5391,7 +5439,7 @@
</li>
<li class="md-nav__item">
<a href="#options_47" class="md-nav__link">
<a href="#options_48" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5518,6 +5566,7 @@ show multiple paragraphs with additional details.</p>
<li><a href="#jj-duplicate"><code>jj duplicate</code>↴</a></li>
<li><a href="#jj-edit"><code>jj edit</code>↴</a></li>
<li><a href="#jj-files"><code>jj files</code>↴</a></li>
<li><a href="#jj-fix"><code>jj fix</code>↴</a></li>
<li><a href="#jj-git"><code>jj git</code>↴</a></li>
<li><a href="#jj-git-remote"><code>jj git remote</code>↴</a></li>
<li><a href="#jj-git-remote-add"><code>jj git remote add</code>↴</a></li>
@ -5594,6 +5643,7 @@ show multiple paragraphs with additional details.</p>
<li><code>duplicate</code> — Create a new change with the same content as an existing one</li>
<li><code>edit</code> — Sets the specified revision as the working-copy revision</li>
<li><code>files</code> — List files in a revision</li>
<li><code>fix</code> — Update files with formatting fixes or other changes</li>
<li><code>git</code> — Commands for working with Git remotes and the underlying Git repo</li>
<li><code>init</code> — Create a new repo in the given directory</li>
<li><code>interdiff</code> — Compare the changes of two commits</li>
@ -6103,6 +6153,33 @@ Martin von Zweigbergk</p>
<p>Default value: <code>@</code></p>
</li>
</ul>
<h2 id="jj-fix"><code>jj fix</code><a class="headerlink" href="#jj-fix" title="Permanent link">&para;</a></h2>
<p>Update files with formatting fixes or other changes</p>
<p>The primary use case for this command is to apply the results of automatic
code formatting tools to revisions that may not be properly formatted yet.
It can also be used to modify files with other tools like <code>sed</code> or <code>sort</code>.</p>
<p>The changed files in the given revisions will be updated with any fixes
determined by passing their file content through the external tool.
Descendants will also be updated by passing their versions of the same files
through the same external tool, which will never result in new conflicts.
Files with existing conflicts will be updated on all sides of the conflict,
which can potentially increase or decrease the number of conflict markers.</p>
<p>The external tool must accept the current file content on standard input,
and return the updated file content on standard output. The output will not
be used unless the tool exits with a successful exit code. Output on
standard error will be passed through to the terminal.</p>
<p>The configuration schema is expected to change in the future. For now, it
defines a single command that will affect all changed files in the specified
revisions. For example, to format some Rust code changed in the working copy
revision, you could write this configuration:</p>
<p>[fix]
tool-command = ["rustfmt", "--emit", "stdout"]</p>
<p>And then run the command <code>jj fix -s @</code>.</p>
<p><strong>Usage:</strong> <code>jj fix [OPTIONS]</code></p>
<h6 id="options_21"><strong>Options:</strong><a class="headerlink" href="#options_21" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-s</code>, <code>--source &lt;SOURCE&gt;</code> — Fix files in the specified revision(s) and their descendants</li>
</ul>
<h2 id="jj-git"><code>jj git</code><a class="headerlink" href="#jj-git" title="Permanent link">&para;</a></h2>
<p>Commands for working with Git remotes and the underlying Git repo</p>
<p>For a comparison with Git, including a table of commands, see https://github.com/martinvonz/jj/blob/main/docs/git-comparison.md.</p>
@ -6164,7 +6241,7 @@ Martin von Zweigbergk</p>
<p>Default value: <code>.</code></p>
</li>
</ul>
<h6 id="options_21"><strong>Options:</strong><a class="headerlink" href="#options_21" title="Permanent link">&para;</a></h6>
<h6 id="options_22"><strong>Options:</strong><a class="headerlink" href="#options_22" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--colocate</code> — Specifies that the <code>jj</code> repo should also be a valid <code>git</code> repo, allowing the use of both <code>jj</code> and <code>git</code> commands in the same directory</p>
@ -6178,7 +6255,7 @@ Martin von Zweigbergk</p>
<p>Fetch from a Git remote</p>
<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 git fetch [OPTIONS]</code></p>
<h6 id="options_22"><strong>Options:</strong><a class="headerlink" href="#options_22" title="Permanent link">&para;</a></h6>
<h6 id="options_23"><strong>Options:</strong><a class="headerlink" href="#options_23" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-b</code>, <code>--branch &lt;BRANCH&gt;</code> — Fetch only some of the branches</p>
@ -6201,7 +6278,7 @@ Martin von Zweigbergk</p>
<li><code>&lt;SOURCE&gt;</code> — URL or path of the Git repo to clone</li>
<li><code>&lt;DESTINATION&gt;</code> — The directory to write the Jujutsu repo to</li>
</ul>
<h6 id="options_23"><strong>Options:</strong><a class="headerlink" href="#options_23" title="Permanent link">&para;</a></h6>
<h6 id="options_24"><strong>Options:</strong><a class="headerlink" href="#options_24" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--colocate</code> — Whether or not to colocate the Jujutsu repo with the git repo</p>
@ -6213,7 +6290,7 @@ Martin von Zweigbergk</p>
<p>By default, pushes any branches pointing to <code>remote_branches(remote=&lt;remote&gt;)..@</code>. Use <code>--branch</code> to push specific branches. Use <code>--all</code> to push all branches. Use <code>--change</code> to generate branch names based on the change IDs of specific commits.</p>
<p>Before the command actually moves, creates, or deletes a remote branch, it makes several <a href="https://martinvonz.github.io/jj/latest/branches/#pushing-branches-safety-checks">safety checks</a>. If there is a problem, you may need to run <code>jj git fetch --remote &lt;remote name&gt;</code> and/or resolve some <a href="https://martinvonz.github.io/jj/latest/branches/#conflicts">branch conflicts</a>.</p>
<p><strong>Usage:</strong> <code>jj git push [OPTIONS]</code></p>
<h6 id="options_24"><strong>Options:</strong><a class="headerlink" href="#options_24" title="Permanent link">&para;</a></h6>
<h6 id="options_25"><strong>Options:</strong><a class="headerlink" href="#options_25" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--remote &lt;REMOTE&gt;</code> — The remote to push to (only named remotes are supported)</li>
<li><code>-b</code>, <code>--branch &lt;BRANCH&gt;</code> — Push only this branch, or branches matching a pattern (can be repeated)</li>
@ -6256,7 +6333,7 @@ Martin von Zweigbergk</p>
<p>Default value: <code>.</code></p>
</li>
</ul>
<h6 id="options_25"><strong>Options:</strong><a class="headerlink" href="#options_25" title="Permanent link">&para;</a></h6>
<h6 id="options_26"><strong>Options:</strong><a class="headerlink" href="#options_26" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--git</code> — DEPRECATED: Use <code>jj git init</code> Use the Git backend, creating a jj repo backed by a Git repo</p>
@ -6274,7 +6351,7 @@ Martin von Zweigbergk</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Restrict the diff to these paths</li>
</ul>
<h6 id="options_26"><strong>Options:</strong><a class="headerlink" href="#options_26" title="Permanent link">&para;</a></h6>
<h6 id="options_27"><strong>Options:</strong><a class="headerlink" href="#options_27" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--from &lt;FROM&gt;</code> — Show changes from this revision</li>
<li><code>--to &lt;TO&gt;</code> — Show changes to this revision</li>
@ -6312,7 +6389,7 @@ Martin von Zweigbergk</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Show revisions modifying the given paths</li>
</ul>
<h6 id="options_27"><strong>Options:</strong><a class="headerlink" href="#options_27" title="Permanent link">&para;</a></h6>
<h6 id="options_28"><strong>Options:</strong><a class="headerlink" href="#options_28" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-r</code>, <code>--revisions &lt;REVISIONS&gt;</code> — Which revisions to show. If no paths nor revisions are specified, this defaults to the <code>revsets.log</code> setting, or <code>@ | ancestors(immutable_heads().., 2) | trunk()</code> if it is not set</li>
<li>
@ -6371,7 +6448,7 @@ Martin von Zweigbergk</p>
<p>Default value: <code>@</code></p>
</li>
</ul>
<h6 id="options_28"><strong>Options:</strong><a class="headerlink" href="#options_28" title="Permanent link">&para;</a></h6>
<h6 id="options_29"><strong>Options:</strong><a class="headerlink" href="#options_29" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-r</code> — Ignored (but lets you pass <code>-r</code> for consistency with other commands)</li>
<li><code>-m</code>, <code>--message &lt;MESSAGE&gt;</code> — The change description to use</li>
@ -6428,7 +6505,7 @@ implied.</p>
<p>Default value: <code>1</code></p>
</li>
</ul>
<h6 id="options_29"><strong>Options:</strong><a class="headerlink" href="#options_29" title="Permanent link">&para;</a></h6>
<h6 id="options_30"><strong>Options:</strong><a class="headerlink" href="#options_30" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-e</code>, <code>--edit</code> — Instead of creating a new working-copy commit on top of the target commit (like <code>jj new</code>), edit the target commit directly (like <code>jj edit</code>)</p>
@ -6440,7 +6517,7 @@ implied.</p>
<p>Lists the previous commits which a change has pointed to. The current commit of a change evolves when the change is updated, rebased, etc.</p>
<p>Name is derived from Merciual's obsolescence markers.</p>
<p><strong>Usage:</strong> <code>jj obslog [OPTIONS]</code></p>
<h6 id="options_30"><strong>Options:</strong><a class="headerlink" href="#options_30" title="Permanent link">&para;</a></h6>
<h6 id="options_31"><strong>Options:</strong><a class="headerlink" href="#options_31" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code></p>
@ -6509,7 +6586,7 @@ implied.</p>
<h2 id="jj-operation-log"><code>jj operation log</code><a class="headerlink" href="#jj-operation-log" title="Permanent link">&para;</a></h2>
<p>Show the operation log</p>
<p><strong>Usage:</strong> <code>jj operation log [OPTIONS]</code></p>
<h6 id="options_31"><strong>Options:</strong><a class="headerlink" href="#options_31" title="Permanent link">&para;</a></h6>
<h6 id="options_32"><strong>Options:</strong><a class="headerlink" href="#options_32" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-l</code>, <code>--limit &lt;LIMIT&gt;</code> — Limit number of operations to show</li>
<li>
@ -6531,7 +6608,7 @@ implied.</p>
<p>Default value: <code>@</code></p>
</li>
</ul>
<h6 id="options_32"><strong>Options:</strong><a class="headerlink" href="#options_32" title="Permanent link">&para;</a></h6>
<h6 id="options_33"><strong>Options:</strong><a class="headerlink" href="#options_33" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--what &lt;WHAT&gt;</code> — What portions of the local state to restore (can be repeated)</p>
@ -6553,7 +6630,7 @@ implied.</p>
<ul>
<li><code>&lt;OPERATION&gt;</code> — The operation to restore to</li>
</ul>
<h6 id="options_33"><strong>Options:</strong><a class="headerlink" href="#options_33" title="Permanent link">&para;</a></h6>
<h6 id="options_34"><strong>Options:</strong><a class="headerlink" href="#options_34" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--what &lt;WHAT&gt;</code> — What portions of the local state to restore (can be repeated)</p>
@ -6626,7 +6703,7 @@ implied.</p>
<p>Default value: <code>1</code></p>
</li>
</ul>
<h6 id="options_34"><strong>Options:</strong><a class="headerlink" href="#options_34" title="Permanent link">&para;</a></h6>
<h6 id="options_35"><strong>Options:</strong><a class="headerlink" href="#options_35" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-e</code>, <code>--edit</code> — Edit the parent directly, instead of moving the working-copy commit</p>
@ -6706,7 +6783,7 @@ J J
<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] &lt;--destination &lt;DESTINATION&gt;|--insert-after &lt;INSERT_AFTER&gt;|--insert-before &lt;INSERT_BEFORE&gt;&gt;</code></p>
<h6 id="options_35"><strong>Options:</strong><a class="headerlink" href="#options_35" title="Permanent link">&para;</a></h6>
<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>
@ -6732,7 +6809,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Restrict to these paths when searching for a conflict to resolve. We will attempt to resolve the first conflict we can find. You can use the <code>--list</code> argument to find paths to use here</li>
</ul>
<h6 id="options_36"><strong>Options:</strong><a class="headerlink" href="#options_36" title="Permanent link">&para;</a></h6>
<h6 id="options_37"><strong>Options:</strong><a class="headerlink" href="#options_37" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code></p>
@ -6757,7 +6834,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Restore only these paths (instead of all paths)</li>
</ul>
<h6 id="options_37"><strong>Options:</strong><a class="headerlink" href="#options_37" title="Permanent link">&para;</a></h6>
<h6 id="options_38"><strong>Options:</strong><a class="headerlink" href="#options_38" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--from &lt;FROM&gt;</code> — Revision to restore from (source)</li>
<li><code>--to &lt;TO&gt;</code> — Revision to restore into (destination)</li>
@ -6777,7 +6854,7 @@ commit. This is true in general; it is not specific to this command.</p>
<p>Default value: <code>@</code></p>
</li>
</ul>
<h6 id="options_38"><strong>Options:</strong><a class="headerlink" href="#options_38" title="Permanent link">&para;</a></h6>
<h6 id="options_39"><strong>Options:</strong><a class="headerlink" href="#options_39" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-r</code> — Ignored (but lets you pass <code>-r</code> for consistency with other commands)</p>
@ -6829,7 +6906,7 @@ commit. This is true in general; it is not specific to this command.</p>
<p>Update the patterns that are present in the working copy</p>
<p>For example, if all you need is the <code>README.md</code> and the <code>lib/</code> directory, use <code>jj sparse set --clear --add README.md --add lib</code>. If you no longer need the <code>lib</code> directory, use <code>jj sparse set --remove lib</code>.</p>
<p><strong>Usage:</strong> <code>jj sparse set [OPTIONS]</code></p>
<h6 id="options_39"><strong>Options:</strong><a class="headerlink" href="#options_39" title="Permanent link">&para;</a></h6>
<h6 id="options_40"><strong>Options:</strong><a class="headerlink" href="#options_40" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--add &lt;ADD&gt;</code> — Patterns to add to the working copy</li>
<li><code>--remove &lt;REMOVE&gt;</code> — Patterns to remove from the working copy</li>
@ -6854,7 +6931,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Put these paths in the first commit</li>
</ul>
<h6 id="options_40"><strong>Options:</strong><a class="headerlink" href="#options_40" title="Permanent link">&para;</a></h6>
<h6 id="options_41"><strong>Options:</strong><a class="headerlink" href="#options_41" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-i</code>, <code>--interactive</code> — Interactively choose which parts to split. This is the default if no paths are provided</p>
@ -6884,7 +6961,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Move only changes to these paths (instead of all paths)</li>
</ul>
<h6 id="options_41"><strong>Options:</strong><a class="headerlink" href="#options_41" title="Permanent link">&para;</a></h6>
<h6 id="options_42"><strong>Options:</strong><a class="headerlink" href="#options_42" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — Revision to squash into its parent (default: @)</li>
<li><code>--from &lt;FROM&gt;</code> — Revision(s) to squash from (default: @)</li>
@ -6932,7 +7009,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;NAMES&gt;</code> — Show tags whose local name matches</li>
</ul>
<h6 id="options_42"><strong>Options:</strong><a class="headerlink" href="#options_42" title="Permanent link">&para;</a></h6>
<h6 id="options_43"><strong>Options:</strong><a class="headerlink" href="#options_43" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render each tag using the given template</li>
</ul>
@ -6971,7 +7048,7 @@ compinit
<p>Possible values: <code>bash</code>, <code>elvish</code>, <code>fish</code>, <code>nushell</code>, <code>power-shell</code>, <code>zsh</code></p>
</li>
</ul>
<h6 id="options_43"><strong>Options:</strong><a class="headerlink" href="#options_43" title="Permanent link">&para;</a></h6>
<h6 id="options_44"><strong>Options:</strong><a class="headerlink" href="#options_44" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--bash</code> — Deprecated. Use the SHELL positional argument instead</p>
@ -6989,7 +7066,7 @@ compinit
<h2 id="jj-util-gc"><code>jj util gc</code><a class="headerlink" href="#jj-util-gc" title="Permanent link">&para;</a></h2>
<p>Run backend-dependent garbage collection</p>
<p><strong>Usage:</strong> <code>jj util gc [OPTIONS]</code></p>
<h6 id="options_44"><strong>Options:</strong><a class="headerlink" href="#options_44" title="Permanent link">&para;</a></h6>
<h6 id="options_45"><strong>Options:</strong><a class="headerlink" href="#options_45" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--expire &lt;EXPIRE&gt;</code> — Time threshold</li>
</ul>
@ -7012,7 +7089,7 @@ compinit
<p>Default value: <code>@</code></p>
</li>
</ul>
<h6 id="options_45"><strong>Options:</strong><a class="headerlink" href="#options_45" title="Permanent link">&para;</a></h6>
<h6 id="options_46"><strong>Options:</strong><a class="headerlink" href="#options_46" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--what &lt;WHAT&gt;</code> — What portions of the local state to restore (can be repeated)</p>
@ -7032,7 +7109,7 @@ compinit
<p>If the source became empty and both the source and destination had a non-empty description, you will be asked for the combined description. If either was empty, then the other one will be used.</p>
<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 unsquash [OPTIONS]</code></p>
<h6 id="options_46"><strong>Options:</strong><a class="headerlink" href="#options_46" title="Permanent link">&para;</a></h6>
<h6 id="options_47"><strong>Options:</strong><a class="headerlink" href="#options_47" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code></p>
@ -7078,7 +7155,7 @@ compinit
<ul>
<li><code>&lt;DESTINATION&gt;</code> — Where to create the new workspace</li>
</ul>
<h6 id="options_47"><strong>Options:</strong><a class="headerlink" href="#options_47" title="Permanent link">&para;</a></h6>
<h6 id="options_48"><strong>Options:</strong><a class="headerlink" href="#options_48" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--name &lt;NAME&gt;</code> — A name for the workspace</li>
<li><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — A list of parent revisions for the working-copy commit of the newly created workspace. You may specify nothing, or any number of parents</li>

2
main/search/search_index.json
View file

File diff suppressed because one or more lines are too long

239
nightly/cli-reference/index.html
View file

@ -1253,6 +1253,30 @@
</ul>
</nav>
</li>
<li class="md-nav__item">
<a href="#jj-fix" class="md-nav__link">
<span class="md-ellipsis">
jj fix
</span>
</a>
<nav class="md-nav" aria-label="jj fix">
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_21" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
</a>
</li>
</ul>
</nav>
</li>
<li class="md-nav__item">
@ -1404,7 +1428,7 @@
</li>
<li class="md-nav__item">
<a href="#options_21" class="md-nav__link">
<a href="#options_22" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1428,7 +1452,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_22" class="md-nav__link">
<a href="#options_23" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1461,7 +1485,7 @@
</li>
<li class="md-nav__item">
<a href="#options_23" class="md-nav__link">
<a href="#options_24" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1485,7 +1509,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_24" class="md-nav__link">
<a href="#options_25" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1536,7 +1560,7 @@
</li>
<li class="md-nav__item">
<a href="#options_25" class="md-nav__link">
<a href="#options_26" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1569,7 +1593,7 @@
</li>
<li class="md-nav__item">
<a href="#options_26" class="md-nav__link">
<a href="#options_27" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1602,7 +1626,7 @@
</li>
<li class="md-nav__item">
<a href="#options_27" class="md-nav__link">
<a href="#options_28" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1635,7 +1659,7 @@
</li>
<li class="md-nav__item">
<a href="#options_28" class="md-nav__link">
<a href="#options_29" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1668,7 +1692,7 @@
</li>
<li class="md-nav__item">
<a href="#options_29" class="md-nav__link">
<a href="#options_30" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1692,7 +1716,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_30" class="md-nav__link">
<a href="#options_31" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1764,7 +1788,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_31" class="md-nav__link">
<a href="#options_32" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1797,7 +1821,7 @@
</li>
<li class="md-nav__item">
<a href="#options_32" class="md-nav__link">
<a href="#options_33" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1830,7 +1854,7 @@
</li>
<li class="md-nav__item">
<a href="#options_33" class="md-nav__link">
<a href="#options_34" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1887,7 +1911,7 @@
</li>
<li class="md-nav__item">
<a href="#options_34" class="md-nav__link">
<a href="#options_35" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1911,7 +1935,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_35" class="md-nav__link">
<a href="#options_36" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1944,7 +1968,7 @@
</li>
<li class="md-nav__item">
<a href="#options_36" class="md-nav__link">
<a href="#options_37" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1977,7 +2001,7 @@
</li>
<li class="md-nav__item">
<a href="#options_37" class="md-nav__link">
<a href="#options_38" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2019,7 +2043,7 @@
</li>
<li class="md-nav__item">
<a href="#options_38" class="md-nav__link">
<a href="#options_39" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2076,7 +2100,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_39" class="md-nav__link">
<a href="#options_40" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2127,7 +2151,7 @@
</li>
<li class="md-nav__item">
<a href="#options_40" class="md-nav__link">
<a href="#options_41" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2160,7 +2184,7 @@
</li>
<li class="md-nav__item">
<a href="#options_41" class="md-nav__link">
<a href="#options_42" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2241,7 +2265,7 @@
</li>
<li class="md-nav__item">
<a href="#options_42" class="md-nav__link">
<a href="#options_43" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2298,7 +2322,7 @@
</li>
<li class="md-nav__item">
<a href="#options_43" class="md-nav__link">
<a href="#options_44" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2322,7 +2346,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_44" class="md-nav__link">
<a href="#options_45" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2382,7 +2406,7 @@
</li>
<li class="md-nav__item">
<a href="#options_45" class="md-nav__link">
<a href="#options_46" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2406,7 +2430,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_46" class="md-nav__link">
<a href="#options_47" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2496,7 +2520,7 @@
</li>
<li class="md-nav__item">
<a href="#options_47" class="md-nav__link">
<a href="#options_48" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4148,6 +4172,30 @@
</ul>
</nav>
</li>
<li class="md-nav__item">
<a href="#jj-fix" class="md-nav__link">
<span class="md-ellipsis">
jj fix
</span>
</a>
<nav class="md-nav" aria-label="jj fix">
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_21" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
</a>
</li>
</ul>
</nav>
</li>
<li class="md-nav__item">
@ -4299,7 +4347,7 @@
</li>
<li class="md-nav__item">
<a href="#options_21" class="md-nav__link">
<a href="#options_22" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4323,7 +4371,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_22" class="md-nav__link">
<a href="#options_23" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4356,7 +4404,7 @@
</li>
<li class="md-nav__item">
<a href="#options_23" class="md-nav__link">
<a href="#options_24" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4380,7 +4428,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_24" class="md-nav__link">
<a href="#options_25" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4431,7 +4479,7 @@
</li>
<li class="md-nav__item">
<a href="#options_25" class="md-nav__link">
<a href="#options_26" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4464,7 +4512,7 @@
</li>
<li class="md-nav__item">
<a href="#options_26" class="md-nav__link">
<a href="#options_27" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4497,7 +4545,7 @@
</li>
<li class="md-nav__item">
<a href="#options_27" class="md-nav__link">
<a href="#options_28" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4530,7 +4578,7 @@
</li>
<li class="md-nav__item">
<a href="#options_28" class="md-nav__link">
<a href="#options_29" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4563,7 +4611,7 @@
</li>
<li class="md-nav__item">
<a href="#options_29" class="md-nav__link">
<a href="#options_30" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4587,7 +4635,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_30" class="md-nav__link">
<a href="#options_31" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4659,7 +4707,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_31" class="md-nav__link">
<a href="#options_32" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4692,7 +4740,7 @@
</li>
<li class="md-nav__item">
<a href="#options_32" class="md-nav__link">
<a href="#options_33" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4725,7 +4773,7 @@
</li>
<li class="md-nav__item">
<a href="#options_33" class="md-nav__link">
<a href="#options_34" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4782,7 +4830,7 @@
</li>
<li class="md-nav__item">
<a href="#options_34" class="md-nav__link">
<a href="#options_35" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4806,7 +4854,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_35" class="md-nav__link">
<a href="#options_36" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4839,7 +4887,7 @@
</li>
<li class="md-nav__item">
<a href="#options_36" class="md-nav__link">
<a href="#options_37" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4872,7 +4920,7 @@
</li>
<li class="md-nav__item">
<a href="#options_37" class="md-nav__link">
<a href="#options_38" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4914,7 +4962,7 @@
</li>
<li class="md-nav__item">
<a href="#options_38" class="md-nav__link">
<a href="#options_39" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4971,7 +5019,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_39" class="md-nav__link">
<a href="#options_40" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5022,7 +5070,7 @@
</li>
<li class="md-nav__item">
<a href="#options_40" class="md-nav__link">
<a href="#options_41" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5055,7 +5103,7 @@
</li>
<li class="md-nav__item">
<a href="#options_41" class="md-nav__link">
<a href="#options_42" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5136,7 +5184,7 @@
</li>
<li class="md-nav__item">
<a href="#options_42" class="md-nav__link">
<a href="#options_43" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5193,7 +5241,7 @@
</li>
<li class="md-nav__item">
<a href="#options_43" class="md-nav__link">
<a href="#options_44" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5217,7 +5265,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_44" class="md-nav__link">
<a href="#options_45" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5277,7 +5325,7 @@
</li>
<li class="md-nav__item">
<a href="#options_45" class="md-nav__link">
<a href="#options_46" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5301,7 +5349,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_46" class="md-nav__link">
<a href="#options_47" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5391,7 +5439,7 @@
</li>
<li class="md-nav__item">
<a href="#options_47" class="md-nav__link">
<a href="#options_48" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5518,6 +5566,7 @@ show multiple paragraphs with additional details.</p>
<li><a href="#jj-duplicate"><code>jj duplicate</code>↴</a></li>
<li><a href="#jj-edit"><code>jj edit</code>↴</a></li>
<li><a href="#jj-files"><code>jj files</code>↴</a></li>
<li><a href="#jj-fix"><code>jj fix</code>↴</a></li>
<li><a href="#jj-git"><code>jj git</code>↴</a></li>
<li><a href="#jj-git-remote"><code>jj git remote</code>↴</a></li>
<li><a href="#jj-git-remote-add"><code>jj git remote add</code>↴</a></li>
@ -5594,6 +5643,7 @@ show multiple paragraphs with additional details.</p>
<li><code>duplicate</code> — Create a new change with the same content as an existing one</li>
<li><code>edit</code> — Sets the specified revision as the working-copy revision</li>
<li><code>files</code> — List files in a revision</li>
<li><code>fix</code> — Update files with formatting fixes or other changes</li>
<li><code>git</code> — Commands for working with Git remotes and the underlying Git repo</li>
<li><code>init</code> — Create a new repo in the given directory</li>
<li><code>interdiff</code> — Compare the changes of two commits</li>
@ -6103,6 +6153,33 @@ Martin von Zweigbergk</p>
<p>Default value: <code>@</code></p>
</li>
</ul>
<h2 id="jj-fix"><code>jj fix</code><a class="headerlink" href="#jj-fix" title="Permanent link">&para;</a></h2>
<p>Update files with formatting fixes or other changes</p>
<p>The primary use case for this command is to apply the results of automatic
code formatting tools to revisions that may not be properly formatted yet.
It can also be used to modify files with other tools like <code>sed</code> or <code>sort</code>.</p>
<p>The changed files in the given revisions will be updated with any fixes
determined by passing their file content through the external tool.
Descendants will also be updated by passing their versions of the same files
through the same external tool, which will never result in new conflicts.
Files with existing conflicts will be updated on all sides of the conflict,
which can potentially increase or decrease the number of conflict markers.</p>
<p>The external tool must accept the current file content on standard input,
and return the updated file content on standard output. The output will not
be used unless the tool exits with a successful exit code. Output on
standard error will be passed through to the terminal.</p>
<p>The configuration schema is expected to change in the future. For now, it
defines a single command that will affect all changed files in the specified
revisions. For example, to format some Rust code changed in the working copy
revision, you could write this configuration:</p>
<p>[fix]
tool-command = ["rustfmt", "--emit", "stdout"]</p>
<p>And then run the command <code>jj fix -s @</code>.</p>
<p><strong>Usage:</strong> <code>jj fix [OPTIONS]</code></p>
<h6 id="options_21"><strong>Options:</strong><a class="headerlink" href="#options_21" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-s</code>, <code>--source &lt;SOURCE&gt;</code> — Fix files in the specified revision(s) and their descendants</li>
</ul>
<h2 id="jj-git"><code>jj git</code><a class="headerlink" href="#jj-git" title="Permanent link">&para;</a></h2>
<p>Commands for working with Git remotes and the underlying Git repo</p>
<p>For a comparison with Git, including a table of commands, see https://github.com/martinvonz/jj/blob/main/docs/git-comparison.md.</p>
@ -6164,7 +6241,7 @@ Martin von Zweigbergk</p>
<p>Default value: <code>.</code></p>
</li>
</ul>
<h6 id="options_21"><strong>Options:</strong><a class="headerlink" href="#options_21" title="Permanent link">&para;</a></h6>
<h6 id="options_22"><strong>Options:</strong><a class="headerlink" href="#options_22" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--colocate</code> — Specifies that the <code>jj</code> repo should also be a valid <code>git</code> repo, allowing the use of both <code>jj</code> and <code>git</code> commands in the same directory</p>
@ -6178,7 +6255,7 @@ Martin von Zweigbergk</p>
<p>Fetch from a Git remote</p>
<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 git fetch [OPTIONS]</code></p>
<h6 id="options_22"><strong>Options:</strong><a class="headerlink" href="#options_22" title="Permanent link">&para;</a></h6>
<h6 id="options_23"><strong>Options:</strong><a class="headerlink" href="#options_23" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-b</code>, <code>--branch &lt;BRANCH&gt;</code> — Fetch only some of the branches</p>
@ -6201,7 +6278,7 @@ Martin von Zweigbergk</p>
<li><code>&lt;SOURCE&gt;</code> — URL or path of the Git repo to clone</li>
<li><code>&lt;DESTINATION&gt;</code> — The directory to write the Jujutsu repo to</li>
</ul>
<h6 id="options_23"><strong>Options:</strong><a class="headerlink" href="#options_23" title="Permanent link">&para;</a></h6>
<h6 id="options_24"><strong>Options:</strong><a class="headerlink" href="#options_24" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--colocate</code> — Whether or not to colocate the Jujutsu repo with the git repo</p>
@ -6213,7 +6290,7 @@ Martin von Zweigbergk</p>
<p>By default, pushes any branches pointing to <code>remote_branches(remote=&lt;remote&gt;)..@</code>. Use <code>--branch</code> to push specific branches. Use <code>--all</code> to push all branches. Use <code>--change</code> to generate branch names based on the change IDs of specific commits.</p>
<p>Before the command actually moves, creates, or deletes a remote branch, it makes several <a href="https://martinvonz.github.io/jj/latest/branches/#pushing-branches-safety-checks">safety checks</a>. If there is a problem, you may need to run <code>jj git fetch --remote &lt;remote name&gt;</code> and/or resolve some <a href="https://martinvonz.github.io/jj/latest/branches/#conflicts">branch conflicts</a>.</p>
<p><strong>Usage:</strong> <code>jj git push [OPTIONS]</code></p>
<h6 id="options_24"><strong>Options:</strong><a class="headerlink" href="#options_24" title="Permanent link">&para;</a></h6>
<h6 id="options_25"><strong>Options:</strong><a class="headerlink" href="#options_25" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--remote &lt;REMOTE&gt;</code> — The remote to push to (only named remotes are supported)</li>
<li><code>-b</code>, <code>--branch &lt;BRANCH&gt;</code> — Push only this branch, or branches matching a pattern (can be repeated)</li>
@ -6256,7 +6333,7 @@ Martin von Zweigbergk</p>
<p>Default value: <code>.</code></p>
</li>
</ul>
<h6 id="options_25"><strong>Options:</strong><a class="headerlink" href="#options_25" title="Permanent link">&para;</a></h6>
<h6 id="options_26"><strong>Options:</strong><a class="headerlink" href="#options_26" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--git</code> — DEPRECATED: Use <code>jj git init</code> Use the Git backend, creating a jj repo backed by a Git repo</p>
@ -6274,7 +6351,7 @@ Martin von Zweigbergk</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Restrict the diff to these paths</li>
</ul>
<h6 id="options_26"><strong>Options:</strong><a class="headerlink" href="#options_26" title="Permanent link">&para;</a></h6>
<h6 id="options_27"><strong>Options:</strong><a class="headerlink" href="#options_27" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--from &lt;FROM&gt;</code> — Show changes from this revision</li>
<li><code>--to &lt;TO&gt;</code> — Show changes to this revision</li>
@ -6312,7 +6389,7 @@ Martin von Zweigbergk</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Show revisions modifying the given paths</li>
</ul>
<h6 id="options_27"><strong>Options:</strong><a class="headerlink" href="#options_27" title="Permanent link">&para;</a></h6>
<h6 id="options_28"><strong>Options:</strong><a class="headerlink" href="#options_28" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-r</code>, <code>--revisions &lt;REVISIONS&gt;</code> — Which revisions to show. If no paths nor revisions are specified, this defaults to the <code>revsets.log</code> setting, or <code>@ | ancestors(immutable_heads().., 2) | trunk()</code> if it is not set</li>
<li>
@ -6371,7 +6448,7 @@ Martin von Zweigbergk</p>
<p>Default value: <code>@</code></p>
</li>
</ul>
<h6 id="options_28"><strong>Options:</strong><a class="headerlink" href="#options_28" title="Permanent link">&para;</a></h6>
<h6 id="options_29"><strong>Options:</strong><a class="headerlink" href="#options_29" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-r</code> — Ignored (but lets you pass <code>-r</code> for consistency with other commands)</li>
<li><code>-m</code>, <code>--message &lt;MESSAGE&gt;</code> — The change description to use</li>
@ -6428,7 +6505,7 @@ implied.</p>
<p>Default value: <code>1</code></p>
</li>
</ul>
<h6 id="options_29"><strong>Options:</strong><a class="headerlink" href="#options_29" title="Permanent link">&para;</a></h6>
<h6 id="options_30"><strong>Options:</strong><a class="headerlink" href="#options_30" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-e</code>, <code>--edit</code> — Instead of creating a new working-copy commit on top of the target commit (like <code>jj new</code>), edit the target commit directly (like <code>jj edit</code>)</p>
@ -6440,7 +6517,7 @@ implied.</p>
<p>Lists the previous commits which a change has pointed to. The current commit of a change evolves when the change is updated, rebased, etc.</p>
<p>Name is derived from Merciual's obsolescence markers.</p>
<p><strong>Usage:</strong> <code>jj obslog [OPTIONS]</code></p>
<h6 id="options_30"><strong>Options:</strong><a class="headerlink" href="#options_30" title="Permanent link">&para;</a></h6>
<h6 id="options_31"><strong>Options:</strong><a class="headerlink" href="#options_31" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code></p>
@ -6509,7 +6586,7 @@ implied.</p>
<h2 id="jj-operation-log"><code>jj operation log</code><a class="headerlink" href="#jj-operation-log" title="Permanent link">&para;</a></h2>
<p>Show the operation log</p>
<p><strong>Usage:</strong> <code>jj operation log [OPTIONS]</code></p>
<h6 id="options_31"><strong>Options:</strong><a class="headerlink" href="#options_31" title="Permanent link">&para;</a></h6>
<h6 id="options_32"><strong>Options:</strong><a class="headerlink" href="#options_32" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-l</code>, <code>--limit &lt;LIMIT&gt;</code> — Limit number of operations to show</li>
<li>
@ -6531,7 +6608,7 @@ implied.</p>
<p>Default value: <code>@</code></p>
</li>
</ul>
<h6 id="options_32"><strong>Options:</strong><a class="headerlink" href="#options_32" title="Permanent link">&para;</a></h6>
<h6 id="options_33"><strong>Options:</strong><a class="headerlink" href="#options_33" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--what &lt;WHAT&gt;</code> — What portions of the local state to restore (can be repeated)</p>
@ -6553,7 +6630,7 @@ implied.</p>
<ul>
<li><code>&lt;OPERATION&gt;</code> — The operation to restore to</li>
</ul>
<h6 id="options_33"><strong>Options:</strong><a class="headerlink" href="#options_33" title="Permanent link">&para;</a></h6>
<h6 id="options_34"><strong>Options:</strong><a class="headerlink" href="#options_34" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--what &lt;WHAT&gt;</code> — What portions of the local state to restore (can be repeated)</p>
@ -6626,7 +6703,7 @@ implied.</p>
<p>Default value: <code>1</code></p>
</li>
</ul>
<h6 id="options_34"><strong>Options:</strong><a class="headerlink" href="#options_34" title="Permanent link">&para;</a></h6>
<h6 id="options_35"><strong>Options:</strong><a class="headerlink" href="#options_35" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-e</code>, <code>--edit</code> — Edit the parent directly, instead of moving the working-copy commit</p>
@ -6706,7 +6783,7 @@ J J
<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] &lt;--destination &lt;DESTINATION&gt;|--insert-after &lt;INSERT_AFTER&gt;|--insert-before &lt;INSERT_BEFORE&gt;&gt;</code></p>
<h6 id="options_35"><strong>Options:</strong><a class="headerlink" href="#options_35" title="Permanent link">&para;</a></h6>
<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>
@ -6732,7 +6809,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Restrict to these paths when searching for a conflict to resolve. We will attempt to resolve the first conflict we can find. You can use the <code>--list</code> argument to find paths to use here</li>
</ul>
<h6 id="options_36"><strong>Options:</strong><a class="headerlink" href="#options_36" title="Permanent link">&para;</a></h6>
<h6 id="options_37"><strong>Options:</strong><a class="headerlink" href="#options_37" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code></p>
@ -6757,7 +6834,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Restore only these paths (instead of all paths)</li>
</ul>
<h6 id="options_37"><strong>Options:</strong><a class="headerlink" href="#options_37" title="Permanent link">&para;</a></h6>
<h6 id="options_38"><strong>Options:</strong><a class="headerlink" href="#options_38" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--from &lt;FROM&gt;</code> — Revision to restore from (source)</li>
<li><code>--to &lt;TO&gt;</code> — Revision to restore into (destination)</li>
@ -6777,7 +6854,7 @@ commit. This is true in general; it is not specific to this command.</p>
<p>Default value: <code>@</code></p>
</li>
</ul>
<h6 id="options_38"><strong>Options:</strong><a class="headerlink" href="#options_38" title="Permanent link">&para;</a></h6>
<h6 id="options_39"><strong>Options:</strong><a class="headerlink" href="#options_39" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-r</code> — Ignored (but lets you pass <code>-r</code> for consistency with other commands)</p>
@ -6829,7 +6906,7 @@ commit. This is true in general; it is not specific to this command.</p>
<p>Update the patterns that are present in the working copy</p>
<p>For example, if all you need is the <code>README.md</code> and the <code>lib/</code> directory, use <code>jj sparse set --clear --add README.md --add lib</code>. If you no longer need the <code>lib</code> directory, use <code>jj sparse set --remove lib</code>.</p>
<p><strong>Usage:</strong> <code>jj sparse set [OPTIONS]</code></p>
<h6 id="options_39"><strong>Options:</strong><a class="headerlink" href="#options_39" title="Permanent link">&para;</a></h6>
<h6 id="options_40"><strong>Options:</strong><a class="headerlink" href="#options_40" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--add &lt;ADD&gt;</code> — Patterns to add to the working copy</li>
<li><code>--remove &lt;REMOVE&gt;</code> — Patterns to remove from the working copy</li>
@ -6854,7 +6931,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Put these paths in the first commit</li>
</ul>
<h6 id="options_40"><strong>Options:</strong><a class="headerlink" href="#options_40" title="Permanent link">&para;</a></h6>
<h6 id="options_41"><strong>Options:</strong><a class="headerlink" href="#options_41" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-i</code>, <code>--interactive</code> — Interactively choose which parts to split. This is the default if no paths are provided</p>
@ -6884,7 +6961,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Move only changes to these paths (instead of all paths)</li>
</ul>
<h6 id="options_41"><strong>Options:</strong><a class="headerlink" href="#options_41" title="Permanent link">&para;</a></h6>
<h6 id="options_42"><strong>Options:</strong><a class="headerlink" href="#options_42" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — Revision to squash into its parent (default: @)</li>
<li><code>--from &lt;FROM&gt;</code> — Revision(s) to squash from (default: @)</li>
@ -6932,7 +7009,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;NAMES&gt;</code> — Show tags whose local name matches</li>
</ul>
<h6 id="options_42"><strong>Options:</strong><a class="headerlink" href="#options_42" title="Permanent link">&para;</a></h6>
<h6 id="options_43"><strong>Options:</strong><a class="headerlink" href="#options_43" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render each tag using the given template</li>
</ul>
@ -6971,7 +7048,7 @@ compinit
<p>Possible values: <code>bash</code>, <code>elvish</code>, <code>fish</code>, <code>nushell</code>, <code>power-shell</code>, <code>zsh</code></p>
</li>
</ul>
<h6 id="options_43"><strong>Options:</strong><a class="headerlink" href="#options_43" title="Permanent link">&para;</a></h6>
<h6 id="options_44"><strong>Options:</strong><a class="headerlink" href="#options_44" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--bash</code> — Deprecated. Use the SHELL positional argument instead</p>
@ -6989,7 +7066,7 @@ compinit
<h2 id="jj-util-gc"><code>jj util gc</code><a class="headerlink" href="#jj-util-gc" title="Permanent link">&para;</a></h2>
<p>Run backend-dependent garbage collection</p>
<p><strong>Usage:</strong> <code>jj util gc [OPTIONS]</code></p>
<h6 id="options_44"><strong>Options:</strong><a class="headerlink" href="#options_44" title="Permanent link">&para;</a></h6>
<h6 id="options_45"><strong>Options:</strong><a class="headerlink" href="#options_45" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--expire &lt;EXPIRE&gt;</code> — Time threshold</li>
</ul>
@ -7012,7 +7089,7 @@ compinit
<p>Default value: <code>@</code></p>
</li>
</ul>
<h6 id="options_45"><strong>Options:</strong><a class="headerlink" href="#options_45" title="Permanent link">&para;</a></h6>
<h6 id="options_46"><strong>Options:</strong><a class="headerlink" href="#options_46" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--what &lt;WHAT&gt;</code> — What portions of the local state to restore (can be repeated)</p>
@ -7032,7 +7109,7 @@ compinit
<p>If the source became empty and both the source and destination had a non-empty description, you will be asked for the combined description. If either was empty, then the other one will be used.</p>
<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 unsquash [OPTIONS]</code></p>
<h6 id="options_46"><strong>Options:</strong><a class="headerlink" href="#options_46" title="Permanent link">&para;</a></h6>
<h6 id="options_47"><strong>Options:</strong><a class="headerlink" href="#options_47" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code></p>
@ -7078,7 +7155,7 @@ compinit
<ul>
<li><code>&lt;DESTINATION&gt;</code> — Where to create the new workspace</li>
</ul>
<h6 id="options_47"><strong>Options:</strong><a class="headerlink" href="#options_47" title="Permanent link">&para;</a></h6>
<h6 id="options_48"><strong>Options:</strong><a class="headerlink" href="#options_48" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--name &lt;NAME&gt;</code> — A name for the workspace</li>
<li><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — A list of parent revisions for the working-copy commit of the newly created workspace. You may specify nothing, or any number of parents</li>

2
nightly/search/search_index.json
View file

File diff suppressed because one or more lines are too long

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

@ -1253,6 +1253,30 @@
</ul>
</nav>
</li>
<li class="md-nav__item">
<a href="#jj-fix" class="md-nav__link">
<span class="md-ellipsis">
jj fix
</span>
</a>
<nav class="md-nav" aria-label="jj fix">
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_21" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
</a>
</li>
</ul>
</nav>
</li>
<li class="md-nav__item">
@ -1404,7 +1428,7 @@
</li>
<li class="md-nav__item">
<a href="#options_21" class="md-nav__link">
<a href="#options_22" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1428,7 +1452,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_22" class="md-nav__link">
<a href="#options_23" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1461,7 +1485,7 @@
</li>
<li class="md-nav__item">
<a href="#options_23" class="md-nav__link">
<a href="#options_24" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1485,7 +1509,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_24" class="md-nav__link">
<a href="#options_25" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1536,7 +1560,7 @@
</li>
<li class="md-nav__item">
<a href="#options_25" class="md-nav__link">
<a href="#options_26" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1569,7 +1593,7 @@
</li>
<li class="md-nav__item">
<a href="#options_26" class="md-nav__link">
<a href="#options_27" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1602,7 +1626,7 @@
</li>
<li class="md-nav__item">
<a href="#options_27" class="md-nav__link">
<a href="#options_28" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1635,7 +1659,7 @@
</li>
<li class="md-nav__item">
<a href="#options_28" class="md-nav__link">
<a href="#options_29" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1668,7 +1692,7 @@
</li>
<li class="md-nav__item">
<a href="#options_29" class="md-nav__link">
<a href="#options_30" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1692,7 +1716,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_30" class="md-nav__link">
<a href="#options_31" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1764,7 +1788,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_31" class="md-nav__link">
<a href="#options_32" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1797,7 +1821,7 @@
</li>
<li class="md-nav__item">
<a href="#options_32" class="md-nav__link">
<a href="#options_33" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1830,7 +1854,7 @@
</li>
<li class="md-nav__item">
<a href="#options_33" class="md-nav__link">
<a href="#options_34" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1887,7 +1911,7 @@
</li>
<li class="md-nav__item">
<a href="#options_34" class="md-nav__link">
<a href="#options_35" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1911,7 +1935,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_35" class="md-nav__link">
<a href="#options_36" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1944,7 +1968,7 @@
</li>
<li class="md-nav__item">
<a href="#options_36" class="md-nav__link">
<a href="#options_37" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -1977,7 +2001,7 @@
</li>
<li class="md-nav__item">
<a href="#options_37" class="md-nav__link">
<a href="#options_38" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2019,7 +2043,7 @@
</li>
<li class="md-nav__item">
<a href="#options_38" class="md-nav__link">
<a href="#options_39" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2076,7 +2100,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_39" class="md-nav__link">
<a href="#options_40" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2127,7 +2151,7 @@
</li>
<li class="md-nav__item">
<a href="#options_40" class="md-nav__link">
<a href="#options_41" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2160,7 +2184,7 @@
</li>
<li class="md-nav__item">
<a href="#options_41" class="md-nav__link">
<a href="#options_42" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2241,7 +2265,7 @@
</li>
<li class="md-nav__item">
<a href="#options_42" class="md-nav__link">
<a href="#options_43" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2298,7 +2322,7 @@
</li>
<li class="md-nav__item">
<a href="#options_43" class="md-nav__link">
<a href="#options_44" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2322,7 +2346,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_44" class="md-nav__link">
<a href="#options_45" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2382,7 +2406,7 @@
</li>
<li class="md-nav__item">
<a href="#options_45" class="md-nav__link">
<a href="#options_46" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2406,7 +2430,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_46" class="md-nav__link">
<a href="#options_47" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -2496,7 +2520,7 @@
</li>
<li class="md-nav__item">
<a href="#options_47" class="md-nav__link">
<a href="#options_48" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4148,6 +4172,30 @@
</ul>
</nav>
</li>
<li class="md-nav__item">
<a href="#jj-fix" class="md-nav__link">
<span class="md-ellipsis">
jj fix
</span>
</a>
<nav class="md-nav" aria-label="jj fix">
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_21" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
</a>
</li>
</ul>
</nav>
</li>
<li class="md-nav__item">
@ -4299,7 +4347,7 @@
</li>
<li class="md-nav__item">
<a href="#options_21" class="md-nav__link">
<a href="#options_22" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4323,7 +4371,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_22" class="md-nav__link">
<a href="#options_23" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4356,7 +4404,7 @@
</li>
<li class="md-nav__item">
<a href="#options_23" class="md-nav__link">
<a href="#options_24" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4380,7 +4428,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_24" class="md-nav__link">
<a href="#options_25" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4431,7 +4479,7 @@
</li>
<li class="md-nav__item">
<a href="#options_25" class="md-nav__link">
<a href="#options_26" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4464,7 +4512,7 @@
</li>
<li class="md-nav__item">
<a href="#options_26" class="md-nav__link">
<a href="#options_27" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4497,7 +4545,7 @@
</li>
<li class="md-nav__item">
<a href="#options_27" class="md-nav__link">
<a href="#options_28" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4530,7 +4578,7 @@
</li>
<li class="md-nav__item">
<a href="#options_28" class="md-nav__link">
<a href="#options_29" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4563,7 +4611,7 @@
</li>
<li class="md-nav__item">
<a href="#options_29" class="md-nav__link">
<a href="#options_30" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4587,7 +4635,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_30" class="md-nav__link">
<a href="#options_31" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4659,7 +4707,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_31" class="md-nav__link">
<a href="#options_32" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4692,7 +4740,7 @@
</li>
<li class="md-nav__item">
<a href="#options_32" class="md-nav__link">
<a href="#options_33" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4725,7 +4773,7 @@
</li>
<li class="md-nav__item">
<a href="#options_33" class="md-nav__link">
<a href="#options_34" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4782,7 +4830,7 @@
</li>
<li class="md-nav__item">
<a href="#options_34" class="md-nav__link">
<a href="#options_35" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4806,7 +4854,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_35" class="md-nav__link">
<a href="#options_36" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4839,7 +4887,7 @@
</li>
<li class="md-nav__item">
<a href="#options_36" class="md-nav__link">
<a href="#options_37" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4872,7 +4920,7 @@
</li>
<li class="md-nav__item">
<a href="#options_37" class="md-nav__link">
<a href="#options_38" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4914,7 +4962,7 @@
</li>
<li class="md-nav__item">
<a href="#options_38" class="md-nav__link">
<a href="#options_39" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -4971,7 +5019,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_39" class="md-nav__link">
<a href="#options_40" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5022,7 +5070,7 @@
</li>
<li class="md-nav__item">
<a href="#options_40" class="md-nav__link">
<a href="#options_41" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5055,7 +5103,7 @@
</li>
<li class="md-nav__item">
<a href="#options_41" class="md-nav__link">
<a href="#options_42" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5136,7 +5184,7 @@
</li>
<li class="md-nav__item">
<a href="#options_42" class="md-nav__link">
<a href="#options_43" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5193,7 +5241,7 @@
</li>
<li class="md-nav__item">
<a href="#options_43" class="md-nav__link">
<a href="#options_44" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5217,7 +5265,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_44" class="md-nav__link">
<a href="#options_45" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5277,7 +5325,7 @@
</li>
<li class="md-nav__item">
<a href="#options_45" class="md-nav__link">
<a href="#options_46" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5301,7 +5349,7 @@
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#options_46" class="md-nav__link">
<a href="#options_47" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5391,7 +5439,7 @@
</li>
<li class="md-nav__item">
<a href="#options_47" class="md-nav__link">
<a href="#options_48" class="md-nav__link">
<span class="md-ellipsis">
Options:
</span>
@ -5518,6 +5566,7 @@ show multiple paragraphs with additional details.</p>
<li><a href="#jj-duplicate"><code>jj duplicate</code>↴</a></li>
<li><a href="#jj-edit"><code>jj edit</code>↴</a></li>
<li><a href="#jj-files"><code>jj files</code>↴</a></li>
<li><a href="#jj-fix"><code>jj fix</code>↴</a></li>
<li><a href="#jj-git"><code>jj git</code>↴</a></li>
<li><a href="#jj-git-remote"><code>jj git remote</code>↴</a></li>
<li><a href="#jj-git-remote-add"><code>jj git remote add</code>↴</a></li>
@ -5594,6 +5643,7 @@ show multiple paragraphs with additional details.</p>
<li><code>duplicate</code> — Create a new change with the same content as an existing one</li>
<li><code>edit</code> — Sets the specified revision as the working-copy revision</li>
<li><code>files</code> — List files in a revision</li>
<li><code>fix</code> — Update files with formatting fixes or other changes</li>
<li><code>git</code> — Commands for working with Git remotes and the underlying Git repo</li>
<li><code>init</code> — Create a new repo in the given directory</li>
<li><code>interdiff</code> — Compare the changes of two commits</li>
@ -6103,6 +6153,33 @@ Martin von Zweigbergk</p>
<p>Default value: <code>@</code></p>
</li>
</ul>
<h2 id="jj-fix"><code>jj fix</code><a class="headerlink" href="#jj-fix" title="Permanent link">&para;</a></h2>
<p>Update files with formatting fixes or other changes</p>
<p>The primary use case for this command is to apply the results of automatic
code formatting tools to revisions that may not be properly formatted yet.
It can also be used to modify files with other tools like <code>sed</code> or <code>sort</code>.</p>
<p>The changed files in the given revisions will be updated with any fixes
determined by passing their file content through the external tool.
Descendants will also be updated by passing their versions of the same files
through the same external tool, which will never result in new conflicts.
Files with existing conflicts will be updated on all sides of the conflict,
which can potentially increase or decrease the number of conflict markers.</p>
<p>The external tool must accept the current file content on standard input,
and return the updated file content on standard output. The output will not
be used unless the tool exits with a successful exit code. Output on
standard error will be passed through to the terminal.</p>
<p>The configuration schema is expected to change in the future. For now, it
defines a single command that will affect all changed files in the specified
revisions. For example, to format some Rust code changed in the working copy
revision, you could write this configuration:</p>
<p>[fix]
tool-command = ["rustfmt", "--emit", "stdout"]</p>
<p>And then run the command <code>jj fix -s @</code>.</p>
<p><strong>Usage:</strong> <code>jj fix [OPTIONS]</code></p>
<h6 id="options_21"><strong>Options:</strong><a class="headerlink" href="#options_21" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-s</code>, <code>--source &lt;SOURCE&gt;</code> — Fix files in the specified revision(s) and their descendants</li>
</ul>
<h2 id="jj-git"><code>jj git</code><a class="headerlink" href="#jj-git" title="Permanent link">&para;</a></h2>
<p>Commands for working with Git remotes and the underlying Git repo</p>
<p>For a comparison with Git, including a table of commands, see https://github.com/martinvonz/jj/blob/main/docs/git-comparison.md.</p>
@ -6164,7 +6241,7 @@ Martin von Zweigbergk</p>
<p>Default value: <code>.</code></p>
</li>
</ul>
<h6 id="options_21"><strong>Options:</strong><a class="headerlink" href="#options_21" title="Permanent link">&para;</a></h6>
<h6 id="options_22"><strong>Options:</strong><a class="headerlink" href="#options_22" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--colocate</code> — Specifies that the <code>jj</code> repo should also be a valid <code>git</code> repo, allowing the use of both <code>jj</code> and <code>git</code> commands in the same directory</p>
@ -6178,7 +6255,7 @@ Martin von Zweigbergk</p>
<p>Fetch from a Git remote</p>
<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 git fetch [OPTIONS]</code></p>
<h6 id="options_22"><strong>Options:</strong><a class="headerlink" href="#options_22" title="Permanent link">&para;</a></h6>
<h6 id="options_23"><strong>Options:</strong><a class="headerlink" href="#options_23" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-b</code>, <code>--branch &lt;BRANCH&gt;</code> — Fetch only some of the branches</p>
@ -6201,7 +6278,7 @@ Martin von Zweigbergk</p>
<li><code>&lt;SOURCE&gt;</code> — URL or path of the Git repo to clone</li>
<li><code>&lt;DESTINATION&gt;</code> — The directory to write the Jujutsu repo to</li>
</ul>
<h6 id="options_23"><strong>Options:</strong><a class="headerlink" href="#options_23" title="Permanent link">&para;</a></h6>
<h6 id="options_24"><strong>Options:</strong><a class="headerlink" href="#options_24" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--colocate</code> — Whether or not to colocate the Jujutsu repo with the git repo</p>
@ -6213,7 +6290,7 @@ Martin von Zweigbergk</p>
<p>By default, pushes any branches pointing to <code>remote_branches(remote=&lt;remote&gt;)..@</code>. Use <code>--branch</code> to push specific branches. Use <code>--all</code> to push all branches. Use <code>--change</code> to generate branch names based on the change IDs of specific commits.</p>
<p>Before the command actually moves, creates, or deletes a remote branch, it makes several <a href="https://martinvonz.github.io/jj/latest/branches/#pushing-branches-safety-checks">safety checks</a>. If there is a problem, you may need to run <code>jj git fetch --remote &lt;remote name&gt;</code> and/or resolve some <a href="https://martinvonz.github.io/jj/latest/branches/#conflicts">branch conflicts</a>.</p>
<p><strong>Usage:</strong> <code>jj git push [OPTIONS]</code></p>
<h6 id="options_24"><strong>Options:</strong><a class="headerlink" href="#options_24" title="Permanent link">&para;</a></h6>
<h6 id="options_25"><strong>Options:</strong><a class="headerlink" href="#options_25" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--remote &lt;REMOTE&gt;</code> — The remote to push to (only named remotes are supported)</li>
<li><code>-b</code>, <code>--branch &lt;BRANCH&gt;</code> — Push only this branch, or branches matching a pattern (can be repeated)</li>
@ -6256,7 +6333,7 @@ Martin von Zweigbergk</p>
<p>Default value: <code>.</code></p>
</li>
</ul>
<h6 id="options_25"><strong>Options:</strong><a class="headerlink" href="#options_25" title="Permanent link">&para;</a></h6>
<h6 id="options_26"><strong>Options:</strong><a class="headerlink" href="#options_26" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--git</code> — DEPRECATED: Use <code>jj git init</code> Use the Git backend, creating a jj repo backed by a Git repo</p>
@ -6274,7 +6351,7 @@ Martin von Zweigbergk</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Restrict the diff to these paths</li>
</ul>
<h6 id="options_26"><strong>Options:</strong><a class="headerlink" href="#options_26" title="Permanent link">&para;</a></h6>
<h6 id="options_27"><strong>Options:</strong><a class="headerlink" href="#options_27" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--from &lt;FROM&gt;</code> — Show changes from this revision</li>
<li><code>--to &lt;TO&gt;</code> — Show changes to this revision</li>
@ -6312,7 +6389,7 @@ Martin von Zweigbergk</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Show revisions modifying the given paths</li>
</ul>
<h6 id="options_27"><strong>Options:</strong><a class="headerlink" href="#options_27" title="Permanent link">&para;</a></h6>
<h6 id="options_28"><strong>Options:</strong><a class="headerlink" href="#options_28" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-r</code>, <code>--revisions &lt;REVISIONS&gt;</code> — Which revisions to show. If no paths nor revisions are specified, this defaults to the <code>revsets.log</code> setting, or <code>@ | ancestors(immutable_heads().., 2) | trunk()</code> if it is not set</li>
<li>
@ -6371,7 +6448,7 @@ Martin von Zweigbergk</p>
<p>Default value: <code>@</code></p>
</li>
</ul>
<h6 id="options_28"><strong>Options:</strong><a class="headerlink" href="#options_28" title="Permanent link">&para;</a></h6>
<h6 id="options_29"><strong>Options:</strong><a class="headerlink" href="#options_29" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-r</code> — Ignored (but lets you pass <code>-r</code> for consistency with other commands)</li>
<li><code>-m</code>, <code>--message &lt;MESSAGE&gt;</code> — The change description to use</li>
@ -6428,7 +6505,7 @@ implied.</p>
<p>Default value: <code>1</code></p>
</li>
</ul>
<h6 id="options_29"><strong>Options:</strong><a class="headerlink" href="#options_29" title="Permanent link">&para;</a></h6>
<h6 id="options_30"><strong>Options:</strong><a class="headerlink" href="#options_30" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-e</code>, <code>--edit</code> — Instead of creating a new working-copy commit on top of the target commit (like <code>jj new</code>), edit the target commit directly (like <code>jj edit</code>)</p>
@ -6440,7 +6517,7 @@ implied.</p>
<p>Lists the previous commits which a change has pointed to. The current commit of a change evolves when the change is updated, rebased, etc.</p>
<p>Name is derived from Merciual's obsolescence markers.</p>
<p><strong>Usage:</strong> <code>jj obslog [OPTIONS]</code></p>
<h6 id="options_30"><strong>Options:</strong><a class="headerlink" href="#options_30" title="Permanent link">&para;</a></h6>
<h6 id="options_31"><strong>Options:</strong><a class="headerlink" href="#options_31" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code></p>
@ -6509,7 +6586,7 @@ implied.</p>
<h2 id="jj-operation-log"><code>jj operation log</code><a class="headerlink" href="#jj-operation-log" title="Permanent link">&para;</a></h2>
<p>Show the operation log</p>
<p><strong>Usage:</strong> <code>jj operation log [OPTIONS]</code></p>
<h6 id="options_31"><strong>Options:</strong><a class="headerlink" href="#options_31" title="Permanent link">&para;</a></h6>
<h6 id="options_32"><strong>Options:</strong><a class="headerlink" href="#options_32" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-l</code>, <code>--limit &lt;LIMIT&gt;</code> — Limit number of operations to show</li>
<li>
@ -6531,7 +6608,7 @@ implied.</p>
<p>Default value: <code>@</code></p>
</li>
</ul>
<h6 id="options_32"><strong>Options:</strong><a class="headerlink" href="#options_32" title="Permanent link">&para;</a></h6>
<h6 id="options_33"><strong>Options:</strong><a class="headerlink" href="#options_33" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--what &lt;WHAT&gt;</code> — What portions of the local state to restore (can be repeated)</p>
@ -6553,7 +6630,7 @@ implied.</p>
<ul>
<li><code>&lt;OPERATION&gt;</code> — The operation to restore to</li>
</ul>
<h6 id="options_33"><strong>Options:</strong><a class="headerlink" href="#options_33" title="Permanent link">&para;</a></h6>
<h6 id="options_34"><strong>Options:</strong><a class="headerlink" href="#options_34" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--what &lt;WHAT&gt;</code> — What portions of the local state to restore (can be repeated)</p>
@ -6626,7 +6703,7 @@ implied.</p>
<p>Default value: <code>1</code></p>
</li>
</ul>
<h6 id="options_34"><strong>Options:</strong><a class="headerlink" href="#options_34" title="Permanent link">&para;</a></h6>
<h6 id="options_35"><strong>Options:</strong><a class="headerlink" href="#options_35" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-e</code>, <code>--edit</code> — Edit the parent directly, instead of moving the working-copy commit</p>
@ -6706,7 +6783,7 @@ J J
<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] &lt;--destination &lt;DESTINATION&gt;|--insert-after &lt;INSERT_AFTER&gt;|--insert-before &lt;INSERT_BEFORE&gt;&gt;</code></p>
<h6 id="options_35"><strong>Options:</strong><a class="headerlink" href="#options_35" title="Permanent link">&para;</a></h6>
<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>
@ -6732,7 +6809,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Restrict to these paths when searching for a conflict to resolve. We will attempt to resolve the first conflict we can find. You can use the <code>--list</code> argument to find paths to use here</li>
</ul>
<h6 id="options_36"><strong>Options:</strong><a class="headerlink" href="#options_36" title="Permanent link">&para;</a></h6>
<h6 id="options_37"><strong>Options:</strong><a class="headerlink" href="#options_37" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code></p>
@ -6757,7 +6834,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Restore only these paths (instead of all paths)</li>
</ul>
<h6 id="options_37"><strong>Options:</strong><a class="headerlink" href="#options_37" title="Permanent link">&para;</a></h6>
<h6 id="options_38"><strong>Options:</strong><a class="headerlink" href="#options_38" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--from &lt;FROM&gt;</code> — Revision to restore from (source)</li>
<li><code>--to &lt;TO&gt;</code> — Revision to restore into (destination)</li>
@ -6777,7 +6854,7 @@ commit. This is true in general; it is not specific to this command.</p>
<p>Default value: <code>@</code></p>
</li>
</ul>
<h6 id="options_38"><strong>Options:</strong><a class="headerlink" href="#options_38" title="Permanent link">&para;</a></h6>
<h6 id="options_39"><strong>Options:</strong><a class="headerlink" href="#options_39" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-r</code> — Ignored (but lets you pass <code>-r</code> for consistency with other commands)</p>
@ -6829,7 +6906,7 @@ commit. This is true in general; it is not specific to this command.</p>
<p>Update the patterns that are present in the working copy</p>
<p>For example, if all you need is the <code>README.md</code> and the <code>lib/</code> directory, use <code>jj sparse set --clear --add README.md --add lib</code>. If you no longer need the <code>lib</code> directory, use <code>jj sparse set --remove lib</code>.</p>
<p><strong>Usage:</strong> <code>jj sparse set [OPTIONS]</code></p>
<h6 id="options_39"><strong>Options:</strong><a class="headerlink" href="#options_39" title="Permanent link">&para;</a></h6>
<h6 id="options_40"><strong>Options:</strong><a class="headerlink" href="#options_40" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--add &lt;ADD&gt;</code> — Patterns to add to the working copy</li>
<li><code>--remove &lt;REMOVE&gt;</code> — Patterns to remove from the working copy</li>
@ -6854,7 +6931,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Put these paths in the first commit</li>
</ul>
<h6 id="options_40"><strong>Options:</strong><a class="headerlink" href="#options_40" title="Permanent link">&para;</a></h6>
<h6 id="options_41"><strong>Options:</strong><a class="headerlink" href="#options_41" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-i</code>, <code>--interactive</code> — Interactively choose which parts to split. This is the default if no paths are provided</p>
@ -6884,7 +6961,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;PATHS&gt;</code> — Move only changes to these paths (instead of all paths)</li>
</ul>
<h6 id="options_41"><strong>Options:</strong><a class="headerlink" href="#options_41" title="Permanent link">&para;</a></h6>
<h6 id="options_42"><strong>Options:</strong><a class="headerlink" href="#options_42" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — Revision to squash into its parent (default: @)</li>
<li><code>--from &lt;FROM&gt;</code> — Revision(s) to squash from (default: @)</li>
@ -6932,7 +7009,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul>
<li><code>&lt;NAMES&gt;</code> — Show tags whose local name matches</li>
</ul>
<h6 id="options_42"><strong>Options:</strong><a class="headerlink" href="#options_42" title="Permanent link">&para;</a></h6>
<h6 id="options_43"><strong>Options:</strong><a class="headerlink" href="#options_43" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render each tag using the given template</li>
</ul>
@ -6971,7 +7048,7 @@ compinit
<p>Possible values: <code>bash</code>, <code>elvish</code>, <code>fish</code>, <code>nushell</code>, <code>power-shell</code>, <code>zsh</code></p>
</li>
</ul>
<h6 id="options_43"><strong>Options:</strong><a class="headerlink" href="#options_43" title="Permanent link">&para;</a></h6>
<h6 id="options_44"><strong>Options:</strong><a class="headerlink" href="#options_44" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--bash</code> — Deprecated. Use the SHELL positional argument instead</p>
@ -6989,7 +7066,7 @@ compinit
<h2 id="jj-util-gc"><code>jj util gc</code><a class="headerlink" href="#jj-util-gc" title="Permanent link">&para;</a></h2>
<p>Run backend-dependent garbage collection</p>
<p><strong>Usage:</strong> <code>jj util gc [OPTIONS]</code></p>
<h6 id="options_44"><strong>Options:</strong><a class="headerlink" href="#options_44" title="Permanent link">&para;</a></h6>
<h6 id="options_45"><strong>Options:</strong><a class="headerlink" href="#options_45" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--expire &lt;EXPIRE&gt;</code> — Time threshold</li>
</ul>
@ -7012,7 +7089,7 @@ compinit
<p>Default value: <code>@</code></p>
</li>
</ul>
<h6 id="options_45"><strong>Options:</strong><a class="headerlink" href="#options_45" title="Permanent link">&para;</a></h6>
<h6 id="options_46"><strong>Options:</strong><a class="headerlink" href="#options_46" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>--what &lt;WHAT&gt;</code> — What portions of the local state to restore (can be repeated)</p>
@ -7032,7 +7109,7 @@ compinit
<p>If the source became empty and both the source and destination had a non-empty description, you will be asked for the combined description. If either was empty, then the other one will be used.</p>
<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 unsquash [OPTIONS]</code></p>
<h6 id="options_46"><strong>Options:</strong><a class="headerlink" href="#options_46" title="Permanent link">&para;</a></h6>
<h6 id="options_47"><strong>Options:</strong><a class="headerlink" href="#options_47" title="Permanent link">&para;</a></h6>
<ul>
<li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code></p>
@ -7078,7 +7155,7 @@ compinit
<ul>
<li><code>&lt;DESTINATION&gt;</code> — Where to create the new workspace</li>
</ul>
<h6 id="options_47"><strong>Options:</strong><a class="headerlink" href="#options_47" title="Permanent link">&para;</a></h6>
<h6 id="options_48"><strong>Options:</strong><a class="headerlink" href="#options_48" title="Permanent link">&para;</a></h6>
<ul>
<li><code>--name &lt;NAME&gt;</code> — A name for the workspace</li>
<li><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — A list of parent revisions for the working-copy commit of the newly created workspace. You may specify nothing, or any number of parents</li>

2
prerelease/search/search_index.json
View file

File diff suppressed because one or more lines are too long