cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-05 23:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deployed 041c4fe to v0.25.0 with MkDocs 1.6.1 and mike 2.1.3

Browse Source
This commit is contained in:
jj-docs[bot] 2025-01-02 04:01:54 +00:00
parent be3a5f8f33
commit 981ff253f4
127 changed files with 85351 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
latest/FAQ/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/FAQ/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/FAQ/">
<link rel="prev" href="../windows/"> <link rel="prev" href="../windows/">
@ -1728,7 +1728,7 @@
<h3 id="why-does-my-bookmark-not-move-to-the-new-commit-after-jj-newcommit">Why does my bookmark not move to the new commit after <code>jj new/commit</code>?<a class="headerlink" href="#why-does-my-bookmark-not-move-to-the-new-commit-after-jj-newcommit" title="Permanent link">&para;</a></h3> <h3 id="why-does-my-bookmark-not-move-to-the-new-commit-after-jj-newcommit">Why does my bookmark not move to the new commit after <code>jj new/commit</code>?<a class="headerlink" href="#why-does-my-bookmark-not-move-to-the-new-commit-after-jj-newcommit" title="Permanent link">&para;</a></h3>
<p>If you're familiar with Git, you might expect the current bookmark to move forward <p>If you're familiar with Git, you might expect the current bookmark to move forward
when you commit. However, Jujutsu does not have a concept of a "current bookmark".</p> when you commit. However, Jujutsu does not have a concept of a "current bookmark".</p>
<p>To move bookmarks, use <code>jj bookmark set</code>.</p> <p>To move bookmarks, use <code>jj bookmark move</code>.</p>
<h3 id="i-made-a-commit-and-jj-git-push-all-says-nothing-changed-instead-of-pushing-it-what-do-i-do">I made a commit and <code>jj git push --all</code> says "Nothing changed" instead of pushing it. What do I do?<a class="headerlink" href="#i-made-a-commit-and-jj-git-push-all-says-nothing-changed-instead-of-pushing-it-what-do-i-do" title="Permanent link">&para;</a></h3> <h3 id="i-made-a-commit-and-jj-git-push-all-says-nothing-changed-instead-of-pushing-it-what-do-i-do">I made a commit and <code>jj git push --all</code> says "Nothing changed" instead of pushing it. What do I do?<a class="headerlink" href="#i-made-a-commit-and-jj-git-push-all-says-nothing-changed-instead-of-pushing-it-what-do-i-do" title="Permanent link">&para;</a></h3>
<p><code>jj git push --all</code> pushes all <em>bookmarks</em>, not all revisions. You have two <p><code>jj git push --all</code> pushes all <em>bookmarks</em>, not all revisions. You have two
options:</p> options:</p>
@ -1760,7 +1760,7 @@ For example:</p>
The <code>--ignore-working-copy</code> option avoids conflicts with manual operations during the creation of snapshots. The <code>--ignore-working-copy</code> option avoids conflicts with manual operations during the creation of snapshots.
Martin used watch in a <a href="https://github.com/tmux/tmux/wiki">tmux</a> pane during his presentation <a href="https://www.youtube.com/watch?v=LV0JzI8IcCY">Jujutsu - A Git-compatible VCS</a>.</p> Martin used watch in a <a href="https://github.com/tmux/tmux/wiki">tmux</a> pane during his presentation <a href="https://www.youtube.com/watch?v=LV0JzI8IcCY">Jujutsu - A Git-compatible VCS</a>.</p>
<p>Alternatively, you can use <a href="https://github.com/tim-janik/jj-fzf">jj-fzf</a>, where the central piece is the <code>jj log</code> view and common operations can be carried out via key bindings while the log view updates.</p> <p>Alternatively, you can use <a href="https://github.com/tim-janik/jj-fzf">jj-fzf</a>, where the central piece is the <code>jj log</code> view and common operations can be carried out via key bindings while the log view updates.</p>
<p>The wiki lists additional TUIs and GUIs beyond the terminal: <a href="https://github.com/martinvonz/jj/wiki/GUI-and-TUI">GUI-and-TUI</a></p> <p>The wiki lists additional TUIs and GUIs beyond the terminal: <a href="https://github.com/jj-vcs/jj/wiki/GUI-and-TUI">GUI-and-TUI</a></p>
<h3 id="should-i-co-locate-my-repository">Should I co-locate my repository?<a class="headerlink" href="#should-i-co-locate-my-repository" title="Permanent link">&para;</a></h3> <h3 id="should-i-co-locate-my-repository">Should I co-locate my repository?<a class="headerlink" href="#should-i-co-locate-my-repository" title="Permanent link">&para;</a></h3>
<p>Co-locating a Jujutsu repository allows you to use both Jujutsu and Git in the <p>Co-locating a Jujutsu repository allows you to use both Jujutsu and Git in the
same working copy. The benefits of doing so are:</p> same working copy. The benefits of doing so are:</p>
@ -1789,7 +1789,7 @@ important ones are:</p>
and ignore the confusing information such tools present for conflicted commits and ignore the confusing information such tools present for conflicted commits
(unless you are curious about <a href="../technical/conflicts/">the details of how <code>jj</code> stores (unless you are curious about <a href="../technical/conflicts/">the details of how <code>jj</code> stores
conflicts</a>). See conflicts</a>). See
<a href="https://github.com/martinvonz/jj/issues/3979">#3979</a> for plans to improve <a href="https://github.com/jj-vcs/jj/issues/3979">#3979</a> for plans to improve
this situation.</p> this situation.</p>
</li> </li>
<li> <li>
@ -1841,7 +1841,7 @@ working-copy commit with <code>jj split -i</code> (or the practically identical
<code>jj commit -i</code>).</p> <code>jj commit -i</code>).</p>
<p>For the equivalent of <code>git commit --amend -p</code>/<code>hg amend -i</code>, use <code>jj squash -i</code>.</p> <p>For the equivalent of <code>git commit --amend -p</code>/<code>hg amend -i</code>, use <code>jj squash -i</code>.</p>
<h3 id="is-there-something-like-git-rebase-interactive-or-hg-histedit">Is there something like <code>git rebase --interactive</code> or <code>hg histedit</code>?<a class="headerlink" href="#is-there-something-like-git-rebase-interactive-or-hg-histedit" title="Permanent link">&para;</a></h3> <h3 id="is-there-something-like-git-rebase-interactive-or-hg-histedit">Is there something like <code>git rebase --interactive</code> or <code>hg histedit</code>?<a class="headerlink" href="#is-there-something-like-git-rebase-interactive-or-hg-histedit" title="Permanent link">&para;</a></h3>
<p>Not yet, you can check <a href="https://github.com/martinvonz/jj/issues/1531">this issue</a> for updates.</p> <p>Not yet, you can check <a href="https://github.com/jj-vcs/jj/issues/1531">this issue</a> for updates.</p>
<p>To reorder commits, it is for now recommended to rebase commits individually, <p>To reorder commits, it is for now recommended to rebase commits individually,
which may require multiple invocations of <code>jj rebase -r</code> or <code>jj rebase -s</code>.</p> which may require multiple invocations of <code>jj rebase -r</code> or <code>jj rebase -s</code>.</p>
<p>To squash or split commits, use <code>jj squash</code> and <code>jj split</code>.</p> <p>To squash or split commits, use <code>jj squash</code> and <code>jj split</code>.</p>
@ -1975,7 +1975,7 @@ of them before abandoning it.</p>
<p>A <a href="../bookmarks/#conflicts">conflicted bookmark</a> is a bookmark that refers to multiple <p>A <a href="../bookmarks/#conflicts">conflicted bookmark</a> is a bookmark that refers to multiple
different commits because jj couldn't fully resolve its desired position. different commits because jj couldn't fully resolve its desired position.
Resolving conflicted bookmarks is usually done by setting the bookmark to the Resolving conflicted bookmarks is usually done by setting the bookmark to the
correct commit using <code>jj bookmark set &lt;commit ID&gt;</code>.</p> correct commit using <code>jj bookmark move &lt;name&gt; --to &lt;commit ID&gt;</code>.</p>
<p>Usually, the different commits associated with the conflicted bookmark should all <p>Usually, the different commits associated with the conflicted bookmark should all
appear in the log, but if they don't you can use <code>jj bookmark list</code>to show all the appear in the log, but if they don't you can use <code>jj bookmark list</code>to show all the
commits associated with it.</p> commits associated with it.</p>

4
latest/bookmarks/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/bookmarks/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/bookmarks/">
<link rel="prev" href="../working-copy/"> <link rel="prev" href="../working-copy/">
@ -1763,7 +1763,7 @@ makes several safety checks.</p>
</li> </li>
<li> <li>
<p>The local bookmark must not be <a href="#conflicts">conflicted</a>. If it is, you would <p>The local bookmark must not be <a href="#conflicts">conflicted</a>. If it is, you would
need to use <code>jj bookmark set</code>, for example, to resolve the conflict.</p> need to use <code>jj bookmark move</code>, for example, to resolve the conflict.</p>
<p>This makes <code>jj git push</code> safe even if <code>jj git fetch</code> is performed on a timer <p>This makes <code>jj git push</code> safe even if <code>jj git fetch</code> is performed on a timer
in the background (this situation is a known issue<sup id="fnref:known-issue"><a class="footnote-ref" href="#fn:known-issue">1</a></sup> with some in the background (this situation is a known issue<sup id="fnref:known-issue"><a class="footnote-ref" href="#fn:known-issue">1</a></sup> with some
forms of <code>git push --force-with-lease</code>). If the bookmark moves on a remote in a forms of <code>git push --force-with-lease</code>). If the bookmark moves on a remote in a

324
latest/cli-reference/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/cli-reference/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/cli-reference/">
<link rel="prev" href="../FAQ/"> <link rel="prev" href="../FAQ/">
@ -6371,9 +6371,9 @@ does not match the <code>jj help</code> output exactly.</p>
</ul> </ul>
<h2 id="jj"><code>jj</code><a class="headerlink" href="#jj" title="Permanent link">&para;</a></h2> <h2 id="jj"><code>jj</code><a class="headerlink" href="#jj" title="Permanent link">&para;</a></h2>
<p>Jujutsu (An experimental VCS)</p> <p>Jujutsu (An experimental VCS)</p>
<p>To get started, see the tutorial at https://martinvonz.github.io/jj/latest/tutorial/.</p> <p>To get started, see the tutorial at https://jj-vcs.github.io/jj/latest/tutorial/.</p>
<p><strong>Usage:</strong> <code>jj [OPTIONS] [COMMAND]</code></p> <p><strong>Usage:</strong> <code>jj [OPTIONS] [COMMAND]</code></p>
<p>'jj help --help' list available keywords. Use 'jj help -k' to show help for one of these keywords.</p> <p>'jj help --help' lists available keywords. Use 'jj help -k' to show help for one of these keywords.</p>
<h6 id="subcommands"><strong>Subcommands:</strong><a class="headerlink" href="#subcommands" title="Permanent link">&para;</a></h6> <h6 id="subcommands"><strong>Subcommands:</strong><a class="headerlink" href="#subcommands" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>abandon</code> — Abandon a revision</li> <li><code>abandon</code> — Abandon a revision</li>
@ -6452,19 +6452,22 @@ does not match the <code>jj help</code> output exactly.</p>
<li> <li>
<p><code>--no-pager</code> — Disable the pager</p> <p><code>--no-pager</code> — Disable the pager</p>
</li> </li>
<li><code>--config-toml &lt;TOML&gt;</code> — Additional configuration options (can be repeated)</li> <li>
<p><code>--config &lt;NAME=VALUE&gt;</code> — Additional configuration options (can be repeated)</p>
<p>The name should be specified as TOML dotted keys. The value should be specified as a TOML expression. If string value doesn't contain any TOML constructs (such as array notation), quotes can be omitted.</p>
</li>
<li>
<p><code>--config-file &lt;PATH&gt;</code> — Additional configuration files (can be repeated)</p>
</li>
</ul> </ul>
<h2 id="jj-abandon"><code>jj abandon</code><a class="headerlink" href="#jj-abandon" title="Permanent link">&para;</a></h2> <h2 id="jj-abandon"><code>jj abandon</code><a class="headerlink" href="#jj-abandon" title="Permanent link">&para;</a></h2>
<p>Abandon a revision</p> <p>Abandon a revision</p>
<p>Abandon a revision, rebasing descendants onto its parent(s). The behavior is similar to <code>jj restore --changes-in</code>; the difference is that <code>jj abandon</code> gives you a new change, while <code>jj restore</code> updates the existing change.</p> <p>Abandon a revision, rebasing descendants onto its parent(s). The behavior is similar to <code>jj restore --changes-in</code>; the difference is that <code>jj abandon</code> gives you a new change, while <code>jj restore</code> updates the existing change.</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>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 abandon [OPTIONS] [REVISIONS]...</code></p> <p><strong>Usage:</strong> <code>jj abandon [OPTIONS] [REVSETS]...</code></p>
<h6 id="arguments"><strong>Arguments:</strong><a class="headerlink" href="#arguments" title="Permanent link">&para;</a></h6> <h6 id="arguments"><strong>Arguments:</strong><a class="headerlink" href="#arguments" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li><code>&lt;REVSETS&gt;</code> — The revision(s) to abandon (default: @)</li>
<p><code>&lt;REVISIONS&gt;</code> — The revision(s) to abandon</p>
<p>Default value: <code>@</code></p>
</li>
</ul> </ul>
<h6 id="options_1"><strong>Options:</strong><a class="headerlink" href="#options_1" title="Permanent link">&para;</a></h6> <h6 id="options_1"><strong>Options:</strong><a class="headerlink" href="#options_1" title="Permanent link">&para;</a></h6>
<ul> <ul>
@ -6474,20 +6477,21 @@ does not match the <code>jj help</code> output exactly.</p>
<h2 id="jj-absorb"><code>jj absorb</code><a class="headerlink" href="#jj-absorb" title="Permanent link">&para;</a></h2> <h2 id="jj-absorb"><code>jj absorb</code><a class="headerlink" href="#jj-absorb" title="Permanent link">&para;</a></h2>
<p>Move changes from a revision into the stack of mutable revisions</p> <p>Move changes from a revision into the stack of mutable revisions</p>
<p>This command splits changes in the source revision and moves each change to the closest mutable ancestor where the corresponding lines were modified last. If the destination revision cannot be determined unambiguously, the change will be left in the source revision.</p> <p>This command splits changes in the source revision and moves each change to the closest mutable ancestor where the corresponding lines were modified last. If the destination revision cannot be determined unambiguously, the change will be left in the source revision.</p>
<p>The source revision will be abandoned if all changes are absorbed into the destination revisions, and if the source revision has no description.</p>
<p>The modification made by <code>jj absorb</code> can be reviewed by <code>jj op show -p</code>.</p> <p>The modification made by <code>jj absorb</code> can be reviewed by <code>jj op show -p</code>.</p>
<p><strong>Usage:</strong> <code>jj absorb [OPTIONS] [PATHS]...</code></p> <p><strong>Usage:</strong> <code>jj absorb [OPTIONS] [FILESETS]...</code></p>
<h6 id="arguments_1"><strong>Arguments:</strong><a class="headerlink" href="#arguments_1" title="Permanent link">&para;</a></h6> <h6 id="arguments_1"><strong>Arguments:</strong><a class="headerlink" href="#arguments_1" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;PATHS&gt;</code> — Move only changes to these paths (instead of all paths)</li> <li><code>&lt;FILESETS&gt;</code> — Move only changes to these paths (instead of all paths)</li>
</ul> </ul>
<h6 id="options_2"><strong>Options:</strong><a class="headerlink" href="#options_2" title="Permanent link">&para;</a></h6> <h6 id="options_2"><strong>Options:</strong><a class="headerlink" href="#options_2" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li>
<p><code>-f</code>, <code>--from &lt;FROM&gt;</code> — Source revision to absorb from</p> <p><code>-f</code>, <code>--from &lt;REVSET&gt;</code> — Source revision to absorb from</p>
<p>Default value: <code>@</code></p> <p>Default value: <code>@</code></p>
</li> </li>
<li> <li>
<p><code>-t</code>, <code>--into &lt;INTO&gt;</code> — Destination revisions to absorb into</p> <p><code>-t</code>, <code>--into &lt;REVSETS&gt;</code> — Destination revisions to absorb into</p>
<p>Only ancestors of the source revision will be considered.</p> <p>Only ancestors of the source revision will be considered.</p>
<p>Default value: <code>mutable()</code></p> <p>Default value: <code>mutable()</code></p>
</li> </li>
@ -6498,17 +6502,17 @@ does not match the <code>jj help</code> output exactly.</p>
<h6 id="options_3"><strong>Options:</strong><a class="headerlink" href="#options_3" title="Permanent link">&para;</a></h6> <h6 id="options_3"><strong>Options:</strong><a class="headerlink" href="#options_3" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li>
<p><code>-r</code>, <code>--revisions &lt;REVISIONS&gt;</code> — The revision(s) to apply the reverse of</p> <p><code>-r</code>, <code>--revisions &lt;REVSETS&gt;</code> — The revision(s) to apply the reverse of</p>
<p>Default value: <code>@</code></p> <p>Default value: <code>@</code></p>
</li> </li>
<li> <li>
<p><code>-d</code>, <code>--destination &lt;DESTINATION&gt;</code> — The revision to apply the reverse changes on top of</p> <p><code>-d</code>, <code>--destination &lt;REVSETS&gt;</code> — The revision to apply the reverse changes on top of</p>
<p>Default value: <code>@</code></p> <p>Default value: <code>@</code></p>
</li> </li>
</ul> </ul>
<h2 id="jj-bookmark"><code>jj bookmark</code><a class="headerlink" href="#jj-bookmark" title="Permanent link">&para;</a></h2> <h2 id="jj-bookmark"><code>jj bookmark</code><a class="headerlink" href="#jj-bookmark" title="Permanent link">&para;</a></h2>
<p>Manage bookmarks [default alias: b]</p> <p>Manage bookmarks [default alias: b]</p>
<p>For information about bookmarks, see https://martinvonz.github.io/jj/latest/bookmarks.</p> <p>For information about bookmarks, see https://jj-vcs.github.io/jj/latest/bookmarks.</p>
<p><strong>Usage:</strong> <code>jj bookmark &lt;COMMAND&gt;</code></p> <p><strong>Usage:</strong> <code>jj bookmark &lt;COMMAND&gt;</code></p>
<h6 id="subcommands_1"><strong>Subcommands:</strong><a class="headerlink" href="#subcommands_1" title="Permanent link">&para;</a></h6> <h6 id="subcommands_1"><strong>Subcommands:</strong><a class="headerlink" href="#subcommands_1" title="Permanent link">&para;</a></h6>
<ul> <ul>
@ -6531,7 +6535,7 @@ does not match the <code>jj help</code> output exactly.</p>
</ul> </ul>
<h6 id="options_4"><strong>Options:</strong><a class="headerlink" href="#options_4" title="Permanent link">&para;</a></h6> <h6 id="options_4"><strong>Options:</strong><a class="headerlink" href="#options_4" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — The bookmark's target revision</li> <li><code>-r</code>, <code>--revision &lt;REVSET&gt;</code> — The bookmark's target revision</li>
</ul> </ul>
<h2 id="jj-bookmark-delete"><code>jj bookmark delete</code><a class="headerlink" href="#jj-bookmark-delete" title="Permanent link">&para;</a></h2> <h2 id="jj-bookmark-delete"><code>jj bookmark delete</code><a class="headerlink" href="#jj-bookmark-delete" title="Permanent link">&para;</a></h2>
<p>Delete an existing bookmark and propagate the deletion to remotes on the next push</p> <p>Delete an existing bookmark and propagate the deletion to remotes on the next push</p>
@ -6540,7 +6544,7 @@ does not match the <code>jj help</code> output exactly.</p>
<ul> <ul>
<li> <li>
<p><code>&lt;NAMES&gt;</code> — The bookmarks to delete</p> <p><code>&lt;NAMES&gt;</code> — The bookmarks to delete</p>
<p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.</p> <p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.</p>
</li> </li>
</ul> </ul>
<h2 id="jj-bookmark-forget"><code>jj bookmark forget</code><a class="headerlink" href="#jj-bookmark-forget" title="Permanent link">&para;</a></h2> <h2 id="jj-bookmark-forget"><code>jj bookmark forget</code><a class="headerlink" href="#jj-bookmark-forget" title="Permanent link">&para;</a></h2>
@ -6551,19 +6555,19 @@ does not match the <code>jj help</code> output exactly.</p>
<ul> <ul>
<li> <li>
<p><code>&lt;NAMES&gt;</code> — The bookmarks to forget</p> <p><code>&lt;NAMES&gt;</code> — The bookmarks to forget</p>
<p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.</p> <p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.</p>
</li> </li>
</ul> </ul>
<h2 id="jj-bookmark-list"><code>jj bookmark list</code><a class="headerlink" href="#jj-bookmark-list" title="Permanent link">&para;</a></h2> <h2 id="jj-bookmark-list"><code>jj bookmark list</code><a class="headerlink" href="#jj-bookmark-list" title="Permanent link">&para;</a></h2>
<p>List bookmarks and their targets</p> <p>List bookmarks and their targets</p>
<p>By default, a tracking remote bookmark will be included only if its target is different from the local target. A non-tracking remote bookmark won't be listed. For a conflicted bookmark (both local and remote), old target revisions are preceded by a "-" and new target revisions are preceded by a "+".</p> <p>By default, a tracking remote bookmark will be included only if its target is different from the local target. A non-tracking remote bookmark won't be listed. For a conflicted bookmark (both local and remote), old target revisions are preceded by a "-" and new target revisions are preceded by a "+".</p>
<p>For information about bookmarks, see https://martinvonz.github.io/jj/latest/bookmarks/.</p> <p>For information about bookmarks, see https://jj-vcs.github.io/jj/latest/bookmarks/.</p>
<p><strong>Usage:</strong> <code>jj bookmark list [OPTIONS] [NAMES]...</code></p> <p><strong>Usage:</strong> <code>jj bookmark list [OPTIONS] [NAMES]...</code></p>
<h6 id="arguments_5"><strong>Arguments:</strong><a class="headerlink" href="#arguments_5" title="Permanent link">&para;</a></h6> <h6 id="arguments_5"><strong>Arguments:</strong><a class="headerlink" href="#arguments_5" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li>
<p><code>&lt;NAMES&gt;</code> — Show bookmarks whose local name matches</p> <p><code>&lt;NAMES&gt;</code> — Show bookmarks whose local name matches</p>
<p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.</p> <p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.</p>
</li> </li>
</ul> </ul>
<h6 id="options_5"><strong>Options:</strong><a class="headerlink" href="#options_5" title="Permanent link">&para;</a></h6> <h6 id="options_5"><strong>Options:</strong><a class="headerlink" href="#options_5" title="Permanent link">&para;</a></h6>
@ -6572,20 +6576,20 @@ does not match the <code>jj help</code> output exactly.</p>
<li> <li>
<p><code>--remote &lt;REMOTE&gt;</code> — Show all tracking and non-tracking remote bookmarks belonging to this remote</p> <p><code>--remote &lt;REMOTE&gt;</code> — Show all tracking and non-tracking remote bookmarks belonging to this remote</p>
<p>Can be combined with <code>--tracked</code> or <code>--conflicted</code> to filter the bookmarks shown (can be repeated.)</p> <p>Can be combined with <code>--tracked</code> or <code>--conflicted</code> to filter the bookmarks shown (can be repeated.)</p>
<p>By default, the specified remote name matches exactly. Use <code>glob:</code> prefix to select remotes by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.</p> <p>By default, the specified remote name matches exactly. Use <code>glob:</code> prefix to select remotes by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.</p>
</li> </li>
<li> <li>
<p><code>-t</code>, <code>--tracked</code> — Show remote tracked bookmarks only. Omits local Git-tracking bookmarks by default</p> <p><code>-t</code>, <code>--tracked</code> — Show remote tracked bookmarks only. Omits local Git-tracking bookmarks by default</p>
</li> </li>
<li><code>-c</code>, <code>--conflicted</code> — Show conflicted bookmarks only</li> <li><code>-c</code>, <code>--conflicted</code> — Show conflicted bookmarks only</li>
<li> <li>
<p><code>-r</code>, <code>--revisions &lt;REVISIONS&gt;</code> — Show bookmarks whose local targets are in the given revisions</p> <p><code>-r</code>, <code>--revisions &lt;REVSETS&gt;</code> — Show bookmarks whose local targets are in the given revisions</p>
<p>Note that <code>-r deleted_bookmark</code> will not work since <code>deleted_bookmark</code> wouldn't have a local target.</p> <p>Note that <code>-r deleted_bookmark</code> will not work since <code>deleted_bookmark</code> wouldn't have a local target.</p>
</li> </li>
<li> <li>
<p><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render each bookmark using the given template</p> <p><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render each bookmark using the given template</p>
<p>All 0-argument methods of the <code>RefName</code> type are available as keywords.</p> <p>All 0-argument methods of the <code>RefName</code> type are available as keywords.</p>
<p>For the syntax, see https://martinvonz.github.io/jj/latest/templates/</p> <p>For the syntax, see https://jj-vcs.github.io/jj/latest/templates/</p>
</li> </li>
</ul> </ul>
<h2 id="jj-bookmark-move"><code>jj bookmark move</code><a class="headerlink" href="#jj-bookmark-move" title="Permanent link">&para;</a></h2> <h2 id="jj-bookmark-move"><code>jj bookmark move</code><a class="headerlink" href="#jj-bookmark-move" title="Permanent link">&para;</a></h2>
@ -6594,19 +6598,19 @@ does not match the <code>jj help</code> output exactly.</p>
<p>If <code>--from</code> options are given, bookmarks currently pointing to the specified revisions will be updated. The bookmarks can also be filtered by names.</p> <p>If <code>--from</code> options are given, bookmarks currently pointing to the specified revisions will be updated. The bookmarks can also be filtered by names.</p>
<p>Example: pull up the nearest bookmarks to the working-copy parent</p> <p>Example: pull up the nearest bookmarks to the working-copy parent</p>
<p>$ jj bookmark move --from 'heads(::@- &amp; bookmarks())' --to @-</p> <p>$ jj bookmark move --from 'heads(::@- &amp; bookmarks())' --to @-</p>
<p><strong>Usage:</strong> <code>jj bookmark move [OPTIONS] &lt;--from &lt;REVISIONS&gt;|NAMES&gt;</code></p> <p><strong>Usage:</strong> <code>jj bookmark move [OPTIONS] &lt;--from &lt;REVSETS&gt;|NAMES&gt;</code></p>
<h6 id="arguments_6"><strong>Arguments:</strong><a class="headerlink" href="#arguments_6" title="Permanent link">&para;</a></h6> <h6 id="arguments_6"><strong>Arguments:</strong><a class="headerlink" href="#arguments_6" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li>
<p><code>&lt;NAMES&gt;</code> — Move bookmarks matching the given name patterns</p> <p><code>&lt;NAMES&gt;</code> — Move bookmarks matching the given name patterns</p>
<p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.</p> <p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.</p>
</li> </li>
</ul> </ul>
<h6 id="options_6"><strong>Options:</strong><a class="headerlink" href="#options_6" title="Permanent link">&para;</a></h6> <h6 id="options_6"><strong>Options:</strong><a class="headerlink" href="#options_6" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>--from &lt;REVISIONS&gt;</code> — Move bookmarks from the given revisions</li> <li><code>--from &lt;REVSETS&gt;</code> — Move bookmarks from the given revisions</li>
<li> <li>
<p><code>--to &lt;REVISION&gt;</code> — Move bookmarks to this revision</p> <p><code>--to &lt;REVSET&gt;</code> — Move bookmarks to this revision</p>
<p>Default value: <code>@</code></p> <p>Default value: <code>@</code></p>
</li> </li>
<li> <li>
@ -6631,7 +6635,7 @@ does not match the <code>jj help</code> output exactly.</p>
</ul> </ul>
<h6 id="options_7"><strong>Options:</strong><a class="headerlink" href="#options_7" title="Permanent link">&para;</a></h6> <h6 id="options_7"><strong>Options:</strong><a class="headerlink" href="#options_7" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — The bookmark's target revision</li> <li><code>-r</code>, <code>--revision &lt;REVSET&gt;</code> — The bookmark's target revision</li>
<li><code>-B</code>, <code>--allow-backwards</code> — Allow moving the bookmark backwards or sideways</li> <li><code>-B</code>, <code>--allow-backwards</code> — Allow moving the bookmark backwards or sideways</li>
</ul> </ul>
<h2 id="jj-bookmark-track"><code>jj bookmark track</code><a class="headerlink" href="#jj-bookmark-track" title="Permanent link">&para;</a></h2> <h2 id="jj-bookmark-track"><code>jj bookmark track</code><a class="headerlink" href="#jj-bookmark-track" title="Permanent link">&para;</a></h2>
@ -6642,7 +6646,7 @@ does not match the <code>jj help</code> output exactly.</p>
<ul> <ul>
<li> <li>
<p><code>&lt;BOOKMARK@REMOTE&gt;</code> — Remote bookmarks to track</p> <p><code>&lt;BOOKMARK@REMOTE&gt;</code> — Remote bookmarks to track</p>
<p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.</p> <p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.</p>
<p>Examples: bookmark@remote, glob:main@<em>, glob:jjfan-</em>@upstream</p> <p>Examples: bookmark@remote, glob:main@<em>, glob:jjfan-</em>@upstream</p>
</li> </li>
</ul> </ul>
@ -6654,16 +6658,16 @@ does not match the <code>jj help</code> output exactly.</p>
<ul> <ul>
<li> <li>
<p><code>&lt;BOOKMARK@REMOTE&gt;</code> — Remote bookmarks to untrack</p> <p><code>&lt;BOOKMARK@REMOTE&gt;</code> — Remote bookmarks to untrack</p>
<p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.</p> <p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.</p>
<p>Examples: bookmark@remote, glob:main@<em>, glob:jjfan-</em>@upstream</p> <p>Examples: bookmark@remote, glob:main@<em>, glob:jjfan-</em>@upstream</p>
</li> </li>
</ul> </ul>
<h2 id="jj-commit"><code>jj commit</code><a class="headerlink" href="#jj-commit" title="Permanent link">&para;</a></h2> <h2 id="jj-commit"><code>jj commit</code><a class="headerlink" href="#jj-commit" title="Permanent link">&para;</a></h2>
<p>Update the description and create a new change on top</p> <p>Update the description and create a new change on top</p>
<p><strong>Usage:</strong> <code>jj commit [OPTIONS] [PATHS]...</code></p> <p><strong>Usage:</strong> <code>jj commit [OPTIONS] [FILESETS]...</code></p>
<h6 id="arguments_11"><strong>Arguments:</strong><a class="headerlink" href="#arguments_11" title="Permanent link">&para;</a></h6> <h6 id="arguments_11"><strong>Arguments:</strong><a class="headerlink" href="#arguments_11" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;PATHS&gt;</code> — Put these paths in the first commit</li> <li><code>&lt;FILESETS&gt;</code> — Put these paths in the first commit</li>
</ul> </ul>
<h6 id="options_8"><strong>Options:</strong><a class="headerlink" href="#options_8" title="Permanent link">&para;</a></h6> <h6 id="options_8"><strong>Options:</strong><a class="headerlink" href="#options_8" title="Permanent link">&para;</a></h6>
<ul> <ul>
@ -6684,7 +6688,7 @@ does not match the <code>jj help</code> output exactly.</p>
<h2 id="jj-config"><code>jj config</code><a class="headerlink" href="#jj-config" title="Permanent link">&para;</a></h2> <h2 id="jj-config"><code>jj config</code><a class="headerlink" href="#jj-config" title="Permanent link">&para;</a></h2>
<p>Manage config options</p> <p>Manage config options</p>
<p>Operates on jj configuration, which comes from the config file and environment variables.</p> <p>Operates on jj configuration, which comes from the config file and environment variables.</p>
<p>For file locations, supported config options, and other details about jj config, see https://martinvonz.github.io/jj/latest/config/.</p> <p>For file locations, supported config options, and other details about jj config, see https://jj-vcs.github.io/jj/latest/config/.</p>
<p><strong>Usage:</strong> <code>jj config &lt;COMMAND&gt;</code></p> <p><strong>Usage:</strong> <code>jj config &lt;COMMAND&gt;</code></p>
<h6 id="subcommands_2"><strong>Subcommands:</strong><a class="headerlink" href="#subcommands_2" title="Permanent link">&para;</a></h6> <h6 id="subcommands_2"><strong>Subcommands:</strong><a class="headerlink" href="#subcommands_2" title="Permanent link">&para;</a></h6>
<ul> <ul>
@ -6738,7 +6742,7 @@ Martin von Zweigbergk</p>
<li><code>value: String</code>: Serialized value in TOML syntax.</li> <li><code>value: String</code>: Serialized value in TOML syntax.</li>
<li><code>overridden: Boolean</code>: True if the value is shadowed by other.</li> <li><code>overridden: Boolean</code>: True if the value is shadowed by other.</li>
</ul> </ul>
<p>For the syntax, see https://martinvonz.github.io/jj/latest/templates/</p> <p>For the syntax, see https://jj-vcs.github.io/jj/latest/templates/</p>
</li> </li>
</ul> </ul>
<h2 id="jj-config-path"><code>jj config path</code><a class="headerlink" href="#jj-config-path" title="Permanent link">&para;</a></h2> <h2 id="jj-config-path"><code>jj config path</code><a class="headerlink" href="#jj-config-path" title="Permanent link">&para;</a></h2>
@ -6757,7 +6761,10 @@ Martin von Zweigbergk</p>
<h6 id="arguments_14"><strong>Arguments:</strong><a class="headerlink" href="#arguments_14" title="Permanent link">&para;</a></h6> <h6 id="arguments_14"><strong>Arguments:</strong><a class="headerlink" href="#arguments_14" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;NAME&gt;</code></li> <li><code>&lt;NAME&gt;</code></li>
<li><code>&lt;VALUE&gt;</code></li> <li>
<p><code>&lt;VALUE&gt;</code> — New value to set</p>
<p>The value should be specified as a TOML expression. If string value doesn't contain any TOML constructs (such as array notation), quotes can be omitted.</p>
</li>
</ul> </ul>
<h6 id="options_12"><strong>Options:</strong><a class="headerlink" href="#options_12" title="Permanent link">&para;</a></h6> <h6 id="options_12"><strong>Options:</strong><a class="headerlink" href="#options_12" title="Permanent link">&para;</a></h6>
<ul> <ul>
@ -6779,13 +6786,10 @@ Martin von Zweigbergk</p>
<h2 id="jj-describe"><code>jj describe</code><a class="headerlink" href="#jj-describe" title="Permanent link">&para;</a></h2> <h2 id="jj-describe"><code>jj describe</code><a class="headerlink" href="#jj-describe" title="Permanent link">&para;</a></h2>
<p>Update the change description or other metadata</p> <p>Update the change description or other metadata</p>
<p>Starts an editor to let you edit the description of changes. The editor will be $EDITOR, or <code>pico</code> if that's not defined (<code>Notepad</code> on Windows).</p> <p>Starts an editor to let you edit the description of changes. The editor will be $EDITOR, or <code>pico</code> if that's not defined (<code>Notepad</code> on Windows).</p>
<p><strong>Usage:</strong> <code>jj describe [OPTIONS] [REVISIONS]...</code></p> <p><strong>Usage:</strong> <code>jj describe [OPTIONS] [REVSETS]...</code></p>
<h6 id="arguments_16"><strong>Arguments:</strong><a class="headerlink" href="#arguments_16" title="Permanent link">&para;</a></h6> <h6 id="arguments_16"><strong>Arguments:</strong><a class="headerlink" href="#arguments_16" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li><code>&lt;REVSETS&gt;</code> — The revision(s) whose description to edit (default: @)</li>
<p><code>&lt;REVISIONS&gt;</code> — The revision(s) whose description to edit</p>
<p>Default value: <code>@</code></p>
</li>
</ul> </ul>
<h6 id="options_14"><strong>Options:</strong><a class="headerlink" href="#options_14" title="Permanent link">&para;</a></h6> <h6 id="options_14"><strong>Options:</strong><a class="headerlink" href="#options_14" title="Permanent link">&para;</a></h6>
<ul> <ul>
@ -6816,21 +6820,21 @@ Martin von Zweigbergk</p>
<p>Compare file contents between two revisions</p> <p>Compare file contents between two revisions</p>
<p>With the <code>-r</code> option, which is the default, shows the changes compared to the parent revision. If there are several parent revisions (i.e., the given revision is a merge), then they will be merged and the changes from the result to the given revision will be shown.</p> <p>With the <code>-r</code> option, which is the default, shows the changes compared to the parent revision. If there are several parent revisions (i.e., the given revision is a merge), then they will be merged and the changes from the result to the given revision will be shown.</p>
<p>With the <code>--from</code> and/or <code>--to</code> options, shows the difference from/to the given revisions. If either is left out, it defaults to the working-copy commit. For example, <code>jj diff --from main</code> shows the changes from "main" (perhaps a bookmark name) to the working-copy commit.</p> <p>With the <code>--from</code> and/or <code>--to</code> options, shows the difference from/to the given revisions. If either is left out, it defaults to the working-copy commit. For example, <code>jj diff --from main</code> shows the changes from "main" (perhaps a bookmark name) to the working-copy commit.</p>
<p><strong>Usage:</strong> <code>jj diff [OPTIONS] [PATHS]...</code></p> <p><strong>Usage:</strong> <code>jj diff [OPTIONS] [FILESETS]...</code></p>
<h6 id="arguments_17"><strong>Arguments:</strong><a class="headerlink" href="#arguments_17" title="Permanent link">&para;</a></h6> <h6 id="arguments_17"><strong>Arguments:</strong><a class="headerlink" href="#arguments_17" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;PATHS&gt;</code> — Restrict the diff to these paths</li> <li><code>&lt;FILESETS&gt;</code> — Restrict the diff to these paths</li>
</ul> </ul>
<h6 id="options_15"><strong>Options:</strong><a class="headerlink" href="#options_15" title="Permanent link">&para;</a></h6> <h6 id="options_15"><strong>Options:</strong><a class="headerlink" href="#options_15" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — Show changes in this revision, compared to its parent(s)</p> <p><code>-r</code>, <code>--revision &lt;REVSET&gt;</code> — Show changes in this revision, compared to its parent(s)</p>
<p>If the revision is a merge commit, this shows changes <em>from</em> the automatic merge of the contents of all of its parents <em>to</em> the contents of the revision itself.</p> <p>If the revision is a merge commit, this shows changes <em>from</em> the automatic merge of the contents of all of its parents <em>to</em> the contents of the revision itself.</p>
</li> </li>
<li> <li>
<p><code>-f</code>, <code>--from &lt;FROM&gt;</code> — Show changes from this revision</p> <p><code>-f</code>, <code>--from &lt;REVSET&gt;</code> — Show changes from this revision</p>
</li> </li>
<li><code>-t</code>, <code>--to &lt;TO&gt;</code> — Show changes to this revision</li> <li><code>-t</code>, <code>--to &lt;REVSET&gt;</code> — Show changes to this revision</li>
<li><code>-s</code>, <code>--summary</code> — For each path, show only whether it was modified, added, or deleted</li> <li><code>-s</code>, <code>--summary</code> — For each path, show only whether it was modified, added, or deleted</li>
<li><code>--stat</code> — Show a histogram of the changes</li> <li><code>--stat</code> — Show a histogram of the changes</li>
<li> <li>
@ -6839,7 +6843,7 @@ Martin von Zweigbergk</p>
</li> </li>
<li> <li>
<p><code>--name-only</code> — For each path, show only its path</p> <p><code>--name-only</code> — For each path, show only its path</p>
<p>Typically useful for shell commands like: <code>jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g</code></p> <p>Typically useful for shell commands like: <code>jj diff -r @- --name-only | xargs perl -pi -e's/OLD/NEW/g</code></p>
</li> </li>
<li> <li>
<p><code>--git</code> — Show a Git-format diff</p> <p><code>--git</code> — Show a Git-format diff</p>
@ -6852,23 +6856,23 @@ Martin von Zweigbergk</p>
</ul> </ul>
<h2 id="jj-diffedit"><code>jj diffedit</code><a class="headerlink" href="#jj-diffedit" title="Permanent link">&para;</a></h2> <h2 id="jj-diffedit"><code>jj diffedit</code><a class="headerlink" href="#jj-diffedit" title="Permanent link">&para;</a></h2>
<p>Touch up the content changes in a revision with a diff editor</p> <p>Touch up the content changes in a revision with a diff editor</p>
<p>With the <code>-r</code> option, which is the default, starts a <a href="https://martinvonz.github.io/jj/latest/config/#editing-diffs">diff editor</a> on the changes in the revision.</p> <p>With the <code>-r</code> option, which is the default, starts a <a href="https://jj-vcs.github.io/jj/latest/config/#editing-diffs">diff editor</a> on the changes in the revision.</p>
<p>With the <code>--from</code> and/or <code>--to</code> options, starts a <a href="https://martinvonz.github.io/jj/latest/config/#editing-diffs">diff editor</a> comparing the "from" revision to the "to" revision.</p> <p>With the <code>--from</code> and/or <code>--to</code> options, starts a <a href="https://jj-vcs.github.io/jj/latest/config/#editing-diffs">diff editor</a> comparing the "from" revision to the "to" revision.</p>
<p>Edit the right side of the diff until it looks the way you want. Once you close the editor, the revision specified with <code>-r</code> or <code>--to</code> will be updated. Unless <code>--restore-descendants</code> is used, descendants will be rebased on top as usual, which may result in conflicts.</p> <p>Edit the right side of the diff until it looks the way you want. Once you close the editor, the revision specified with <code>-r</code> or <code>--to</code> will be updated. Unless <code>--restore-descendants</code> is used, descendants will be rebased on top as usual, which may result in conflicts.</p>
<p>See <code>jj restore</code> if you want to move entire files from one revision to another. For moving changes between revisions, see <code>jj squash -i</code>.</p> <p>See <code>jj restore</code> if you want to move entire files from one revision to another. For moving changes between revisions, see <code>jj squash -i</code>.</p>
<p><strong>Usage:</strong> <code>jj diffedit [OPTIONS]</code></p> <p><strong>Usage:</strong> <code>jj diffedit [OPTIONS]</code></p>
<h6 id="options_16"><strong>Options:</strong><a class="headerlink" href="#options_16" title="Permanent link">&para;</a></h6> <h6 id="options_16"><strong>Options:</strong><a class="headerlink" href="#options_16" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — The revision to touch up</p> <p><code>-r</code>, <code>--revision &lt;REVSET&gt;</code> — The revision to touch up</p>
<p>Defaults to @ if neither --to nor --from are specified.</p> <p>Defaults to @ if neither --to nor --from are specified.</p>
</li> </li>
<li> <li>
<p><code>-f</code>, <code>--from &lt;FROM&gt;</code> — Show changes from this revision</p> <p><code>-f</code>, <code>--from &lt;REVSET&gt;</code> — Show changes from this revision</p>
<p>Defaults to @ if --to is specified.</p> <p>Defaults to @ if --to is specified.</p>
</li> </li>
<li> <li>
<p><code>-t</code>, <code>--to &lt;TO&gt;</code> — Edit changes in this revision</p> <p><code>-t</code>, <code>--to &lt;REVSET&gt;</code> — Edit changes in this revision</p>
<p>Defaults to @ if --from is specified.</p> <p>Defaults to @ if --from is specified.</p>
</li> </li>
<li> <li>
@ -6883,25 +6887,25 @@ Martin von Zweigbergk</p>
<p>Create new changes with the same content as existing ones</p> <p>Create new changes with the same content as existing ones</p>
<p>When none of the <code>--destination</code>, <code>--insert-after</code>, or <code>--insert-before</code> arguments are provided, commits will be duplicated onto their existing parents or onto other newly duplicated commits.</p> <p>When none of the <code>--destination</code>, <code>--insert-after</code>, or <code>--insert-before</code> arguments are provided, commits will be duplicated onto their existing parents or onto other newly duplicated commits.</p>
<p>When any of the <code>--destination</code>, <code>--insert-after</code>, or <code>--insert-before</code> arguments are provided, the roots of the specified commits will be duplicated onto the destination indicated by the arguments. Other specified commits will be duplicated onto these newly duplicated commits. If the <code>--insert-after</code> or <code>--insert-before</code> arguments are provided, the new children indicated by the arguments will be rebased onto the heads of the specified commits.</p> <p>When any of the <code>--destination</code>, <code>--insert-after</code>, or <code>--insert-before</code> arguments are provided, the roots of the specified commits will be duplicated onto the destination indicated by the arguments. Other specified commits will be duplicated onto these newly duplicated commits. If the <code>--insert-after</code> or <code>--insert-before</code> arguments are provided, the new children indicated by the arguments will be rebased onto the heads of the specified commits.</p>
<p><strong>Usage:</strong> <code>jj duplicate [OPTIONS] [REVISIONS]...</code></p> <p><strong>Usage:</strong> <code>jj duplicate [OPTIONS] [REVSETS]...</code></p>
<h6 id="arguments_18"><strong>Arguments:</strong><a class="headerlink" href="#arguments_18" title="Permanent link">&para;</a></h6> <h6 id="arguments_18"><strong>Arguments:</strong><a class="headerlink" href="#arguments_18" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;REVISIONS&gt;</code> — The revision(s) to duplicate (default: @)</li> <li><code>&lt;REVSETS&gt;</code> — The revision(s) to duplicate (default: @)</li>
</ul> </ul>
<h6 id="options_17"><strong>Options:</strong><a class="headerlink" href="#options_17" title="Permanent link">&para;</a></h6> <h6 id="options_17"><strong>Options:</strong><a class="headerlink" href="#options_17" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>-d</code>, <code>--destination &lt;DESTINATION&gt;</code> — The revision(s) to duplicate onto (can be repeated to create a merge commit)</li> <li><code>-d</code>, <code>--destination &lt;REVSETS&gt;</code> — The revision(s) to duplicate onto (can be repeated to create a merge commit)</li>
<li><code>-A</code>, <code>--insert-after &lt;INSERT_AFTER&gt;</code> — The revision(s) to insert after (can be repeated to create a merge commit)</li> <li><code>-A</code>, <code>--insert-after &lt;REVSETS&gt;</code> — The revision(s) to insert after (can be repeated to create a merge commit)</li>
<li><code>-B</code>, <code>--insert-before &lt;INSERT_BEFORE&gt;</code> — The revision(s) to insert before (can be repeated to create a merge commit)</li> <li><code>-B</code>, <code>--insert-before &lt;REVSETS&gt;</code> — The revision(s) to insert before (can be repeated to create a merge commit)</li>
</ul> </ul>
<h2 id="jj-edit"><code>jj edit</code><a class="headerlink" href="#jj-edit" title="Permanent link">&para;</a></h2> <h2 id="jj-edit"><code>jj edit</code><a class="headerlink" href="#jj-edit" title="Permanent link">&para;</a></h2>
<p>Sets the specified revision as the working-copy revision</p> <p>Sets the specified revision as the working-copy revision</p>
<p>Note: it is generally recommended to instead use <code>jj new</code> and <code>jj squash</code>.</p> <p>Note: it is generally recommended to instead use <code>jj new</code> and <code>jj squash</code>.</p>
<p>For more information, see https://martinvonz.github.io/jj/latest/FAQ#how-do-i-resume-working-on-an-existing-change</p> <p>For more information, see https://jj-vcs.github.io/jj/latest/FAQ#how-do-i-resume-working-on-an-existing-change</p>
<p><strong>Usage:</strong> <code>jj edit &lt;REVISION&gt;</code></p> <p><strong>Usage:</strong> <code>jj edit &lt;REVSET&gt;</code></p>
<h6 id="arguments_19"><strong>Arguments:</strong><a class="headerlink" href="#arguments_19" title="Permanent link">&para;</a></h6> <h6 id="arguments_19"><strong>Arguments:</strong><a class="headerlink" href="#arguments_19" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;REVISION&gt;</code> — The commit to edit</li> <li><code>&lt;REVSET&gt;</code> — The commit to edit</li>
</ul> </ul>
<h2 id="jj-evolog"><code>jj evolog</code><a class="headerlink" href="#jj-evolog" title="Permanent link">&para;</a></h2> <h2 id="jj-evolog"><code>jj evolog</code><a class="headerlink" href="#jj-evolog" title="Permanent link">&para;</a></h2>
<p>Show how a change has evolved over time</p> <p>Show how a change has evolved over time</p>
@ -6910,7 +6914,7 @@ Martin von Zweigbergk</p>
<h6 id="options_18"><strong>Options:</strong><a class="headerlink" href="#options_18" title="Permanent link">&para;</a></h6> <h6 id="options_18"><strong>Options:</strong><a class="headerlink" href="#options_18" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code></p> <p><code>-r</code>, <code>--revision &lt;REVSET&gt;</code></p>
<p>Default value: <code>@</code></p> <p>Default value: <code>@</code></p>
</li> </li>
<li> <li>
@ -6919,7 +6923,7 @@ Martin von Zweigbergk</p>
<li><code>--no-graph</code> — Don't show the graph, show a flat list of revisions</li> <li><code>--no-graph</code> — Don't show the graph, show a flat list of revisions</li>
<li> <li>
<p><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render each revision using the given template</p> <p><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render each revision using the given template</p>
<p>For the syntax, see https://martinvonz.github.io/jj/latest/templates/</p> <p>For the syntax, see https://jj-vcs.github.io/jj/latest/templates/</p>
</li> </li>
<li> <li>
<p><code>-p</code>, <code>--patch</code> — Show patch compared to the previous version of this change</p> <p><code>-p</code>, <code>--patch</code> — Show patch compared to the previous version of this change</p>
@ -6935,7 +6939,7 @@ Martin von Zweigbergk</p>
</li> </li>
<li> <li>
<p><code>--name-only</code> — For each path, show only its path</p> <p><code>--name-only</code> — For each path, show only its path</p>
<p>Typically useful for shell commands like: <code>jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g</code></p> <p>Typically useful for shell commands like: <code>jj diff -r @- --name-only | xargs perl -pi -e's/OLD/NEW/g</code></p>
</li> </li>
<li> <li>
<p><code>--git</code> — Show a Git-format diff</p> <p><code>--git</code> — Show a Git-format diff</p>
@ -6968,12 +6972,12 @@ Martin von Zweigbergk</p>
</ul> </ul>
<h6 id="options_19"><strong>Options:</strong><a class="headerlink" href="#options_19" title="Permanent link">&para;</a></h6> <h6 id="options_19"><strong>Options:</strong><a class="headerlink" href="#options_19" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — an optional revision to start at</li> <li><code>-r</code>, <code>--revision &lt;REVSET&gt;</code> — an optional revision to start at</li>
</ul> </ul>
<h2 id="jj-file-chmod"><code>jj file chmod</code><a class="headerlink" href="#jj-file-chmod" title="Permanent link">&para;</a></h2> <h2 id="jj-file-chmod"><code>jj file chmod</code><a class="headerlink" href="#jj-file-chmod" title="Permanent link">&para;</a></h2>
<p>Sets or removes the executable bit for paths in the repo</p> <p>Sets or removes the executable bit for paths in the repo</p>
<p>Unlike the POSIX <code>chmod</code>, <code>jj file chmod</code> also works on Windows, on conflicted files, and on arbitrary revisions.</p> <p>Unlike the POSIX <code>chmod</code>, <code>jj file chmod</code> also works on Windows, on conflicted files, and on arbitrary revisions.</p>
<p><strong>Usage:</strong> <code>jj file chmod [OPTIONS] &lt;MODE&gt; &lt;PATHS&gt;...</code></p> <p><strong>Usage:</strong> <code>jj file chmod [OPTIONS] &lt;MODE&gt; &lt;FILESETS&gt;...</code></p>
<h6 id="arguments_21"><strong>Arguments:</strong><a class="headerlink" href="#arguments_21" title="Permanent link">&para;</a></h6> <h6 id="arguments_21"><strong>Arguments:</strong><a class="headerlink" href="#arguments_21" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li>
@ -6987,42 +6991,42 @@ Martin von Zweigbergk</p>
</ul> </ul>
</li> </li>
<li> <li>
<p><code>&lt;PATHS&gt;</code> — Paths to change the executable bit for</p> <p><code>&lt;FILESETS&gt;</code> — Paths to change the executable bit for</p>
</li> </li>
</ul> </ul>
<h6 id="options_20"><strong>Options:</strong><a class="headerlink" href="#options_20" title="Permanent link">&para;</a></h6> <h6 id="options_20"><strong>Options:</strong><a class="headerlink" href="#options_20" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — The revision to update</p> <p><code>-r</code>, <code>--revision &lt;REVSET&gt;</code> — The revision to update</p>
<p>Default value: <code>@</code></p> <p>Default value: <code>@</code></p>
</li> </li>
</ul> </ul>
<h2 id="jj-file-list"><code>jj file list</code><a class="headerlink" href="#jj-file-list" title="Permanent link">&para;</a></h2> <h2 id="jj-file-list"><code>jj file list</code><a class="headerlink" href="#jj-file-list" title="Permanent link">&para;</a></h2>
<p>List files in a revision</p> <p>List files in a revision</p>
<p><strong>Usage:</strong> <code>jj file list [OPTIONS] [PATHS]...</code></p> <p><strong>Usage:</strong> <code>jj file list [OPTIONS] [FILESETS]...</code></p>
<h6 id="arguments_22"><strong>Arguments:</strong><a class="headerlink" href="#arguments_22" title="Permanent link">&para;</a></h6> <h6 id="arguments_22"><strong>Arguments:</strong><a class="headerlink" href="#arguments_22" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;PATHS&gt;</code> — Only list files matching these prefixes (instead of all files)</li> <li><code>&lt;FILESETS&gt;</code> — Only list files matching these prefixes (instead of all files)</li>
</ul> </ul>
<h6 id="options_21"><strong>Options:</strong><a class="headerlink" href="#options_21" title="Permanent link">&para;</a></h6> <h6 id="options_21"><strong>Options:</strong><a class="headerlink" href="#options_21" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — The revision to list files in</p> <p><code>-r</code>, <code>--revision &lt;REVSET&gt;</code> — The revision to list files in</p>
<p>Default value: <code>@</code></p> <p>Default value: <code>@</code></p>
</li> </li>
</ul> </ul>
<h2 id="jj-file-show"><code>jj file show</code><a class="headerlink" href="#jj-file-show" title="Permanent link">&para;</a></h2> <h2 id="jj-file-show"><code>jj file show</code><a class="headerlink" href="#jj-file-show" title="Permanent link">&para;</a></h2>
<p>Print contents of files in a revision</p> <p>Print contents of files in a revision</p>
<p>If the given path is a directory, files in the directory will be visited recursively.</p> <p>If the given path is a directory, files in the directory will be visited recursively.</p>
<p><strong>Usage:</strong> <code>jj file show [OPTIONS] &lt;PATHS&gt;...</code></p> <p><strong>Usage:</strong> <code>jj file show [OPTIONS] &lt;FILESETS&gt;...</code></p>
<h6 id="arguments_23"><strong>Arguments:</strong><a class="headerlink" href="#arguments_23" title="Permanent link">&para;</a></h6> <h6 id="arguments_23"><strong>Arguments:</strong><a class="headerlink" href="#arguments_23" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;PATHS&gt;</code> — Paths to print</li> <li><code>&lt;FILESETS&gt;</code> — Paths to print</li>
</ul> </ul>
<h6 id="options_22"><strong>Options:</strong><a class="headerlink" href="#options_22" 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> <ul>
<li> <li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — The revision to get the file contents from</p> <p><code>-r</code>, <code>--revision &lt;REVSET&gt;</code> — The revision to get the file contents from</p>
<p>Default value: <code>@</code></p> <p>Default value: <code>@</code></p>
</li> </li>
</ul> </ul>
@ -7030,18 +7034,18 @@ Martin von Zweigbergk</p>
<p>Start tracking specified paths in the working copy</p> <p>Start tracking specified paths in the working copy</p>
<p>Without arguments, all paths that are not ignored will be tracked.</p> <p>Without arguments, all paths that are not ignored will be tracked.</p>
<p>New files in the working copy can be automatically tracked. You can configure which paths to automatically track by setting <code>snapshot.auto-track</code> (e.g. to <code>"none()"</code> or <code>"glob:**/*.rs"</code>). Files that don't match the pattern can be manually tracked using this command. The default pattern is <code>all()</code> and this command has no effect.</p> <p>New files in the working copy can be automatically tracked. You can configure which paths to automatically track by setting <code>snapshot.auto-track</code> (e.g. to <code>"none()"</code> or <code>"glob:**/*.rs"</code>). Files that don't match the pattern can be manually tracked using this command. The default pattern is <code>all()</code> and this command has no effect.</p>
<p><strong>Usage:</strong> <code>jj file track &lt;PATHS&gt;...</code></p> <p><strong>Usage:</strong> <code>jj file track &lt;FILESETS&gt;...</code></p>
<h6 id="arguments_24"><strong>Arguments:</strong><a class="headerlink" href="#arguments_24" title="Permanent link">&para;</a></h6> <h6 id="arguments_24"><strong>Arguments:</strong><a class="headerlink" href="#arguments_24" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;PATHS&gt;</code> — Paths to track</li> <li><code>&lt;FILESETS&gt;</code> — Paths to track</li>
</ul> </ul>
<h2 id="jj-file-untrack"><code>jj file untrack</code><a class="headerlink" href="#jj-file-untrack" title="Permanent link">&para;</a></h2> <h2 id="jj-file-untrack"><code>jj file untrack</code><a class="headerlink" href="#jj-file-untrack" title="Permanent link">&para;</a></h2>
<p>Stop tracking specified paths in the working copy</p> <p>Stop tracking specified paths in the working copy</p>
<p><strong>Usage:</strong> <code>jj file untrack &lt;PATHS&gt;...</code></p> <p><strong>Usage:</strong> <code>jj file untrack &lt;FILESETS&gt;...</code></p>
<h6 id="arguments_25"><strong>Arguments:</strong><a class="headerlink" href="#arguments_25" title="Permanent link">&para;</a></h6> <h6 id="arguments_25"><strong>Arguments:</strong><a class="headerlink" href="#arguments_25" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li>
<p><code>&lt;PATHS&gt;</code> — Paths to untrack. They must already be ignored.</p> <p><code>&lt;FILESETS&gt;</code> — Paths to untrack. They must already be ignored.</p>
<p>The paths could be ignored via a .gitignore or .git/info/exclude (in colocated repos).</p> <p>The paths could be ignored via a .gitignore or .git/info/exclude (in colocated repos).</p>
</li> </li>
</ul> </ul>
@ -7101,19 +7105,19 @@ changed files (whether they are Rust files or not):</p>
<p>The tool defined by <code>tool-command</code> acts as if it was the first entry in <p>The tool defined by <code>tool-command</code> acts as if it was the first entry in
<code>fix.tools</code>, and uses <code>pattern = "all()"``. Support for</code>tool-command` <code>fix.tools</code>, and uses <code>pattern = "all()"``. Support for</code>tool-command`
will be removed in a future version.</p> will be removed in a future version.</p>
<p><strong>Usage:</strong> <code>jj fix [OPTIONS] [PATHS]...</code></p> <p><strong>Usage:</strong> <code>jj fix [OPTIONS] [FILESETS]...</code></p>
<h6 id="arguments_26"><strong>Arguments:</strong><a class="headerlink" href="#arguments_26" title="Permanent link">&para;</a></h6> <h6 id="arguments_26"><strong>Arguments:</strong><a class="headerlink" href="#arguments_26" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;PATHS&gt;</code> — Fix only these paths</li> <li><code>&lt;FILESETS&gt;</code> — Fix only these paths</li>
</ul> </ul>
<h6 id="options_23"><strong>Options:</strong><a class="headerlink" href="#options_23" 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> <ul>
<li><code>-s</code>, <code>--source &lt;SOURCE&gt;</code> — Fix files in the specified revision(s) and their descendants. If no revisions are specified, this defaults to the <code>revsets.fix</code> setting, or <code>reachable(@, mutable())</code> if it is not set</li> <li><code>-s</code>, <code>--source &lt;REVSETS&gt;</code> — Fix files in the specified revision(s) and their descendants. If no revisions are specified, this defaults to the <code>revsets.fix</code> setting, or <code>reachable(@, mutable())</code> if it is not set</li>
<li><code>--include-unchanged-files</code> — Fix unchanged files in addition to changed ones. If no paths are specified, all files in the repo will be fixed</li> <li><code>--include-unchanged-files</code> — Fix unchanged files in addition to changed ones. If no paths are specified, all files in the repo will be fixed</li>
</ul> </ul>
<h2 id="jj-git"><code>jj git</code><a class="headerlink" href="#jj-git" title="Permanent link">&para;</a></h2> <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>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://martinvonz.github.io/jj/latest/git-comparison/.</p> <p>For a comparison with Git, including a table of commands, see https://jj-vcs.github.io/jj/latest/git-comparison/.</p>
<p><strong>Usage:</strong> <code>jj git &lt;COMMAND&gt;</code></p> <p><strong>Usage:</strong> <code>jj git &lt;COMMAND&gt;</code></p>
<h6 id="subcommands_4"><strong>Subcommands:</strong><a class="headerlink" href="#subcommands_4" title="Permanent link">&para;</a></h6> <h6 id="subcommands_4"><strong>Subcommands:</strong><a class="headerlink" href="#subcommands_4" title="Permanent link">&para;</a></h6>
<ul> <ul>
@ -7198,24 +7202,25 @@ will be removed in a future version.</p>
<h2 id="jj-git-push"><code>jj git push</code><a class="headerlink" href="#jj-git-push" title="Permanent link">&para;</a></h2> <h2 id="jj-git-push"><code>jj git push</code><a class="headerlink" href="#jj-git-push" title="Permanent link">&para;</a></h2>
<p>Push to a Git remote</p> <p>Push to a Git remote</p>
<p>By default, pushes tracking bookmarks pointing to <code>remote_bookmarks(remote=&lt;remote&gt;)..@</code>. Use <code>--bookmark</code> to push specific bookmarks. Use <code>--all</code> to push all bookmarks. Use <code>--change</code> to generate bookmark names based on the change IDs of specific commits.</p> <p>By default, pushes tracking bookmarks pointing to <code>remote_bookmarks(remote=&lt;remote&gt;)..@</code>. Use <code>--bookmark</code> to push specific bookmarks. Use <code>--all</code> to push all bookmarks. Use <code>--change</code> to generate bookmark names based on the change IDs of specific commits.</p>
<p>Before the command actually moves, creates, or deletes a remote bookmark, it makes several <a href="https://martinvonz.github.io/jj/latest/bookmarks/#pushing-bookmarks-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/bookmarks/#conflicts">bookmark conflicts</a>.</p> <p>Unlike in Git, the remote to push to is not derived from the tracked remote bookmarks. Use <code>--remote</code> to select the remote Git repository by name. There is no option to push to multiple remotes.</p>
<p>Before the command actually moves, creates, or deletes a remote bookmark, it makes several <a href="https://jj-vcs.github.io/jj/latest/bookmarks/#pushing-bookmarks-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://jj-vcs.github.io/jj/latest/bookmarks/#conflicts">bookmark conflicts</a>.</p>
<p><strong>Usage:</strong> <code>jj git push [OPTIONS]</code></p> <p><strong>Usage:</strong> <code>jj git push [OPTIONS]</code></p>
<h6 id="options_27"><strong>Options:</strong><a class="headerlink" href="#options_27" 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> <ul>
<li> <li>
<p><code>--remote &lt;REMOTE&gt;</code> — The remote to push to (only named remotes are supported)</p> <p><code>--remote &lt;REMOTE&gt;</code> — The remote to push to (only named remotes are supported)</p>
<p>This defaults to the <code>git.push</code> setting. If that is not configured, and if there are multiple remotes, the remote named "origin" will be used. Unlike in Git, the default remote is not derived from the tracked remote bookmarks.</p> <p>This defaults to the <code>git.push</code> setting. If that is not configured, and if there are multiple remotes, the remote named "origin" will be used.</p>
</li> </li>
<li> <li>
<p><code>-b</code>, <code>--bookmark &lt;BOOKMARK&gt;</code> — Push only this bookmark, or bookmarks matching a pattern (can be repeated)</p> <p><code>-b</code>, <code>--bookmark &lt;BOOKMARK&gt;</code> — Push only this bookmark, or bookmarks matching a pattern (can be repeated)</p>
<p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets#string-patterns.</p> <p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select bookmarks by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets#string-patterns.</p>
</li> </li>
<li> <li>
<p><code>--all</code> — Push all bookmarks (including new and deleted bookmarks)</p> <p><code>--all</code> — Push all bookmarks (including new and deleted bookmarks)</p>
</li> </li>
<li> <li>
<p><code>--tracked</code> — Push all tracked bookmarks (including deleted bookmarks)</p> <p><code>--tracked</code> — Push all tracked bookmarks (including deleted bookmarks)</p>
<p>This usually means that the bookmark was already pushed to or fetched from the relevant remote. For details, see https://martinvonz.github.io/jj/latest/bookmarks#remotes-and-tracked-bookmarks</p> <p>This usually means that the bookmark was already pushed to or fetched from the relevant remote. For details, see https://jj-vcs.github.io/jj/latest/bookmarks#remotes-and-tracked-bookmarks</p>
</li> </li>
<li> <li>
<p><code>--deleted</code> — Push all deleted bookmarks</p> <p><code>--deleted</code> — Push all deleted bookmarks</p>
@ -7229,9 +7234,9 @@ will be removed in a future version.</p>
<p><code>--allow-empty-description</code> — Allow pushing commits with empty descriptions</p> <p><code>--allow-empty-description</code> — Allow pushing commits with empty descriptions</p>
</li> </li>
<li><code>--allow-private</code> — Allow pushing commits that are private</li> <li><code>--allow-private</code> — Allow pushing commits that are private</li>
<li><code>-r</code>, <code>--revisions &lt;REVISIONS&gt;</code> — Push bookmarks pointing to these commits (can be repeated)</li> <li><code>-r</code>, <code>--revisions &lt;REVSETS&gt;</code> — Push bookmarks pointing to these commits (can be repeated)</li>
<li> <li>
<p><code>-c</code>, <code>--change &lt;CHANGE&gt;</code> — Push this commit by creating a bookmark based on its change ID (can be repeated)</p> <p><code>-c</code>, <code>--change &lt;REVSETS&gt;</code> — Push this commit by creating a bookmark based on its change ID (can be repeated)</p>
<p>The created bookmark will be tracked automatically. Use the <code>git.push-bookmark-prefix</code> setting to change the prefix for generated names.</p> <p>The created bookmark will be tracked automatically. Use the <code>git.push-bookmark-prefix</code> setting to change the prefix for generated names.</p>
</li> </li>
<li> <li>
@ -7297,8 +7302,18 @@ will be removed in a future version.</p>
<p><code>-k</code>, <code>--keyword &lt;KEYWORD&gt;</code> — Show help for keywords instead of commands</p> <p><code>-k</code>, <code>--keyword &lt;KEYWORD&gt;</code> — Show help for keywords instead of commands</p>
<p>Possible values:</p> <p>Possible values:</p>
<ul> <ul>
<li><code>bookmarks</code>:
Named pointers to revisions (similar to Git's branches)</li>
<li><code>config</code>:
How and where to set configuration options</li>
<li><code>filesets</code>:
A functional language for selecting a set of files</li>
<li><code>glossary</code>:
Definitions of various terms</li>
<li><code>revsets</code>: <li><code>revsets</code>:
A functional language for selecting a set of revision</li> A functional language for selecting a set of revision</li>
<li><code>templates</code>:
A functional language to customize command output</li>
<li><code>tutorial</code>: <li><code>tutorial</code>:
Show a tutorial to get started with jj</li> Show a tutorial to get started with jj</li>
</ul> </ul>
@ -7318,15 +7333,15 @@ will be removed in a future version.</p>
<h2 id="jj-interdiff"><code>jj interdiff</code><a class="headerlink" href="#jj-interdiff" title="Permanent link">&para;</a></h2> <h2 id="jj-interdiff"><code>jj interdiff</code><a class="headerlink" href="#jj-interdiff" title="Permanent link">&para;</a></h2>
<p>Compare the changes of two commits</p> <p>Compare the changes of two commits</p>
<p>This excludes changes from other commits by temporarily rebasing <code>--from</code> onto <code>--to</code>'s parents. If you wish to compare the same change across versions, consider <code>jj evolog -p</code> instead.</p> <p>This excludes changes from other commits by temporarily rebasing <code>--from</code> onto <code>--to</code>'s parents. If you wish to compare the same change across versions, consider <code>jj evolog -p</code> instead.</p>
<p><strong>Usage:</strong> <code>jj interdiff [OPTIONS] &lt;--from &lt;FROM&gt;|--to &lt;TO&gt;&gt; [PATHS]...</code></p> <p><strong>Usage:</strong> <code>jj interdiff [OPTIONS] &lt;--from &lt;REVSET&gt;|--to &lt;REVSET&gt;&gt; [FILESETS]...</code></p>
<h6 id="arguments_35"><strong>Arguments:</strong><a class="headerlink" href="#arguments_35" title="Permanent link">&para;</a></h6> <h6 id="arguments_35"><strong>Arguments:</strong><a class="headerlink" href="#arguments_35" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;PATHS&gt;</code> — Restrict the diff to these paths</li> <li><code>&lt;FILESETS&gt;</code> — Restrict the diff to these paths</li>
</ul> </ul>
<h6 id="options_29"><strong>Options:</strong><a class="headerlink" href="#options_29" 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> <ul>
<li><code>-f</code>, <code>--from &lt;FROM&gt;</code> — Show changes from this revision</li> <li><code>-f</code>, <code>--from &lt;REVSET&gt;</code> — Show changes from this revision</li>
<li><code>-t</code>, <code>--to &lt;TO&gt;</code> — Show changes to this revision</li> <li><code>-t</code>, <code>--to &lt;REVSET&gt;</code> — Show changes to this revision</li>
<li><code>-s</code>, <code>--summary</code> — For each path, show only whether it was modified, added, or deleted</li> <li><code>-s</code>, <code>--summary</code> — For each path, show only whether it was modified, added, or deleted</li>
<li><code>--stat</code> — Show a histogram of the changes</li> <li><code>--stat</code> — Show a histogram of the changes</li>
<li> <li>
@ -7335,7 +7350,7 @@ will be removed in a future version.</p>
</li> </li>
<li> <li>
<p><code>--name-only</code> — For each path, show only its path</p> <p><code>--name-only</code> — For each path, show only its path</p>
<p>Typically useful for shell commands like: <code>jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g</code></p> <p>Typically useful for shell commands like: <code>jj diff -r @- --name-only | xargs perl -pi -e's/OLD/NEW/g</code></p>
</li> </li>
<li> <li>
<p><code>--git</code> — Show a Git-format diff</p> <p><code>--git</code> — Show a Git-format diff</p>
@ -7348,18 +7363,18 @@ will be removed in a future version.</p>
</ul> </ul>
<h2 id="jj-log"><code>jj log</code><a class="headerlink" href="#jj-log" title="Permanent link">&para;</a></h2> <h2 id="jj-log"><code>jj log</code><a class="headerlink" href="#jj-log" title="Permanent link">&para;</a></h2>
<p>Show revision history</p> <p>Show revision history</p>
<p>Renders a graphical view of the project's history, ordered with children before parents. By default, the output only includes mutable revisions, along with some additional revisions for context. Use <code>jj log -r ::</code> to see all revisions. See <code>jj help -k revsets</code> (or https://martinvonz.github.io/jj/latest/revsets/) for information about the syntax.</p> <p>Renders a graphical view of the project's history, ordered with children before parents. By default, the output only includes mutable revisions, along with some additional revisions for context. Use <code>jj log -r ::</code> to see all revisions. See <code>jj help -k revsets</code> (or https://jj-vcs.github.io/jj/latest/revsets/) for information about the syntax.</p>
<p>Spans of revisions that are not included in the graph per <code>--revisions</code> are rendered as a synthetic node labeled "(elided revisions)".</p> <p>Spans of revisions that are not included in the graph per <code>--revisions</code> are rendered as a synthetic node labeled "(elided revisions)".</p>
<p>The working-copy commit is indicated by a <code>@</code> symbol in the graph. Immutable revisions (https://martinvonz.github.io/jj/latest/config/#set-of-immutable-commits) have a <code>◆</code> symbol. Other commits have a <code>○</code> symbol. To customize these symbols, see https://martinvonz.github.io/jj/latest/config/#node-style.</p> <p>The working-copy commit is indicated by a <code>@</code> symbol in the graph. Immutable revisions (https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits) have a <code>◆</code> symbol. Other commits have a <code>○</code> symbol. To customize these symbols, see https://jj-vcs.github.io/jj/latest/config/#node-style.</p>
<p><strong>Usage:</strong> <code>jj log [OPTIONS] [PATHS]...</code></p> <p><strong>Usage:</strong> <code>jj log [OPTIONS] [FILESETS]...</code></p>
<h6 id="arguments_36"><strong>Arguments:</strong><a class="headerlink" href="#arguments_36" title="Permanent link">&para;</a></h6> <h6 id="arguments_36"><strong>Arguments:</strong><a class="headerlink" href="#arguments_36" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;PATHS&gt;</code> — Show revisions modifying the given paths</li> <li><code>&lt;FILESETS&gt;</code> — Show revisions modifying the given paths</li>
</ul> </ul>
<h6 id="options_30"><strong>Options:</strong><a class="headerlink" href="#options_30" 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> <ul>
<li> <li>
<p><code>-r</code>, <code>--revisions &lt;REVISIONS&gt;</code> — Which revisions to show</p> <p><code>-r</code>, <code>--revisions &lt;REVSETS&gt;</code> — Which revisions to show</p>
<p>If no paths nor revisions are specified, this defaults to the <code>revsets.log</code> setting.</p> <p>If no paths nor revisions are specified, this defaults to the <code>revsets.log</code> setting.</p>
</li> </li>
<li> <li>
@ -7375,7 +7390,7 @@ will be removed in a future version.</p>
<li> <li>
<p><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render each revision using the given template</p> <p><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render each revision using the given template</p>
<p>Run <code>jj log -T</code> to list the built-in templates.</p> <p>Run <code>jj log -T</code> to list the built-in templates.</p>
<p>You can also specify arbitrary template expressions. For the syntax, see https://martinvonz.github.io/jj/latest/templates/.</p> <p>You can also specify arbitrary template expressions. For the syntax, see https://jj-vcs.github.io/jj/latest/templates/.</p>
<p>If not specified, this defaults to the <code>templates.log</code> setting.</p> <p>If not specified, this defaults to the <code>templates.log</code> setting.</p>
</li> </li>
<li> <li>
@ -7389,7 +7404,7 @@ will be removed in a future version.</p>
</li> </li>
<li> <li>
<p><code>--name-only</code> — For each path, show only its path</p> <p><code>--name-only</code> — For each path, show only its path</p>
<p>Typically useful for shell commands like: <code>jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g</code></p> <p>Typically useful for shell commands like: <code>jj diff -r @- --name-only | xargs perl -pi -e's/OLD/NEW/g</code></p>
</li> </li>
<li> <li>
<p><code>--git</code> — Show a Git-format diff</p> <p><code>--git</code> — Show a Git-format diff</p>
@ -7403,13 +7418,13 @@ will be removed in a future version.</p>
<h2 id="jj-new"><code>jj new</code><a class="headerlink" href="#jj-new" title="Permanent link">&para;</a></h2> <h2 id="jj-new"><code>jj new</code><a class="headerlink" href="#jj-new" title="Permanent link">&para;</a></h2>
<p>Create a new, empty change and (by default) edit it in the working copy</p> <p>Create a new, empty change and (by default) edit it in the working copy</p>
<p>By default, <code>jj</code> will edit the new change, making the working copy represent the new commit. This can be avoided with <code>--no-edit</code>.</p> <p>By default, <code>jj</code> will edit the new change, making the working copy represent the new commit. This can be avoided with <code>--no-edit</code>.</p>
<p>Note that you can create a merge commit by specifying multiple revisions as argument. For example, <code>jj new main @</code> will create a new commit with the <code>main</code> bookmark and the working copy as parents.</p> <p>Note that you can create a merge commit by specifying multiple revisions as argument. For example, <code>jj new @ main</code> will create a new commit with the working copy and the <code>main</code> bookmark as parents.</p>
<p>For more information, see https://martinvonz.github.io/jj/latest/working-copy/.</p> <p>For more information, see https://jj-vcs.github.io/jj/latest/working-copy/.</p>
<p><strong>Usage:</strong> <code>jj new [OPTIONS] [REVISIONS]...</code></p> <p><strong>Usage:</strong> <code>jj new [OPTIONS] [REVSETS]...</code></p>
<h6 id="arguments_37"><strong>Arguments:</strong><a class="headerlink" href="#arguments_37" title="Permanent link">&para;</a></h6> <h6 id="arguments_37"><strong>Arguments:</strong><a class="headerlink" href="#arguments_37" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li>
<p><code>&lt;REVISIONS&gt;</code> — Parent(s) of the new change</p> <p><code>&lt;REVSETS&gt;</code> — Parent(s) of the new change</p>
<p>Default value: <code>@</code></p> <p>Default value: <code>@</code></p>
</li> </li>
</ul> </ul>
@ -7417,8 +7432,8 @@ will be removed in a future version.</p>
<ul> <ul>
<li><code>-m</code>, <code>--message &lt;MESSAGE&gt;</code> — The change description to use</li> <li><code>-m</code>, <code>--message &lt;MESSAGE&gt;</code> — The change description to use</li>
<li><code>--no-edit</code> — Do not edit the newly created change</li> <li><code>--no-edit</code> — Do not edit the newly created change</li>
<li><code>-A</code>, <code>--insert-after &lt;INSERT_AFTER&gt;</code> — Insert the new change after the given commit(s)</li> <li><code>-A</code>, <code>--insert-after &lt;REVSETS&gt;</code> — Insert the new change after the given commit(s)</li>
<li><code>-B</code>, <code>--insert-before &lt;INSERT_BEFORE&gt;</code> — Insert the new change before the given commit(s)</li> <li><code>-B</code>, <code>--insert-before &lt;REVSETS&gt;</code> — Insert the new change before the given commit(s)</li>
</ul> </ul>
<h2 id="jj-next"><code>jj next</code><a class="headerlink" href="#jj-next" title="Permanent link">&para;</a></h2> <h2 id="jj-next"><code>jj next</code><a class="headerlink" href="#jj-next" title="Permanent link">&para;</a></h2>
<p>Move the working-copy commit to the child revision</p> <p>Move the working-copy commit to the child revision</p>
@ -7466,7 +7481,7 @@ B =&gt; @
</ul> </ul>
<h2 id="jj-operation"><code>jj operation</code><a class="headerlink" href="#jj-operation" title="Permanent link">&para;</a></h2> <h2 id="jj-operation"><code>jj operation</code><a class="headerlink" href="#jj-operation" title="Permanent link">&para;</a></h2>
<p>Commands for working with the operation log</p> <p>Commands for working with the operation log</p>
<p>For information about the operation log, see https://martinvonz.github.io/jj/latest/operation-log/.</p> <p>For information about the operation log, see https://jj-vcs.github.io/jj/latest/operation-log/.</p>
<p><strong>Usage:</strong> <code>jj operation &lt;COMMAND&gt;</code></p> <p><strong>Usage:</strong> <code>jj operation &lt;COMMAND&gt;</code></p>
<h6 id="subcommands_6"><strong>Subcommands:</strong><a class="headerlink" href="#subcommands_6" title="Permanent link">&para;</a></h6> <h6 id="subcommands_6"><strong>Subcommands:</strong><a class="headerlink" href="#subcommands_6" title="Permanent link">&para;</a></h6>
<ul> <ul>
@ -7510,7 +7525,7 @@ B =&gt; @
</li> </li>
<li> <li>
<p><code>--name-only</code> — For each path, show only its path</p> <p><code>--name-only</code> — For each path, show only its path</p>
<p>Typically useful for shell commands like: <code>jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g</code></p> <p>Typically useful for shell commands like: <code>jj diff -r @- --name-only | xargs perl -pi -e's/OLD/NEW/g</code></p>
</li> </li>
<li> <li>
<p><code>--git</code> — Show a Git-format diff</p> <p><code>--git</code> — Show a Git-format diff</p>
@ -7531,7 +7546,7 @@ B =&gt; @
<li><code>--no-graph</code> — Don't show the graph, show a flat list of operations</li> <li><code>--no-graph</code> — Don't show the graph, show a flat list of operations</li>
<li> <li>
<p><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render each operation using the given template</p> <p><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render each operation using the given template</p>
<p>For the syntax, see https://martinvonz.github.io/jj/latest/templates/</p> <p>For the syntax, see https://jj-vcs.github.io/jj/latest/templates/</p>
</li> </li>
<li> <li>
<p><code>--op-diff</code> — Show changes to the repository at each operation</p> <p><code>--op-diff</code> — Show changes to the repository at each operation</p>
@ -7550,7 +7565,7 @@ B =&gt; @
</li> </li>
<li> <li>
<p><code>--name-only</code> — For each path, show only its path</p> <p><code>--name-only</code> — For each path, show only its path</p>
<p>Typically useful for shell commands like: <code>jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g</code></p> <p>Typically useful for shell commands like: <code>jj diff -r @- --name-only | xargs perl -pi -e's/OLD/NEW/g</code></p>
</li> </li>
<li> <li>
<p><code>--git</code> — Show a Git-format diff</p> <p><code>--git</code> — Show a Git-format diff</p>
@ -7614,7 +7629,7 @@ B =&gt; @
</li> </li>
<li> <li>
<p><code>--name-only</code> — For each path, show only its path</p> <p><code>--name-only</code> — For each path, show only its path</p>
<p>Typically useful for shell commands like: <code>jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g</code></p> <p>Typically useful for shell commands like: <code>jj diff -r @- --name-only | xargs perl -pi -e's/OLD/NEW/g</code></p>
</li> </li>
<li> <li>
<p><code>--git</code> — Show a Git-format diff</p> <p><code>--git</code> — Show a Git-format diff</p>
@ -7674,10 +7689,10 @@ remains a descendant of both 1 and 2.</p>
<p>Therefore, <code>jj parallelize '1 | 3'</code> is a no-op. That's because 2, which is <p>Therefore, <code>jj parallelize '1 | 3'</code> is a no-op. That's because 2, which is
not in the target set, was a descendant of 1 before, so it remains a not in the target set, was a descendant of 1 before, so it remains a
descendant, and it was an ancestor of 3 before, so it remains an ancestor.</p> descendant, and it was an ancestor of 3 before, so it remains an ancestor.</p>
<p><strong>Usage:</strong> <code>jj parallelize [REVISIONS]...</code></p> <p><strong>Usage:</strong> <code>jj parallelize [REVSETS]...</code></p>
<h6 id="arguments_43"><strong>Arguments:</strong><a class="headerlink" href="#arguments_43" title="Permanent link">&para;</a></h6> <h6 id="arguments_43"><strong>Arguments:</strong><a class="headerlink" href="#arguments_43" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;REVISIONS&gt;</code> — Revisions to parallelize</li> <li><code>&lt;REVSETS&gt;</code> — Revisions to parallelize</li>
</ul> </ul>
<h2 id="jj-prev"><code>jj prev</code><a class="headerlink" href="#jj-prev" title="Permanent link">&para;</a></h2> <h2 id="jj-prev"><code>jj prev</code><a class="headerlink" href="#jj-prev" title="Permanent link">&para;</a></h2>
<p>Change the working copy revision relative to the parent revision</p> <p>Change the working copy revision relative to the parent revision</p>
@ -7795,44 +7810,44 @@ J J
</code></pre></div> </code></pre></div>
<p>If a working-copy commit gets abandoned, it will be given a new, empty <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> 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> <p><strong>Usage:</strong> <code>jj rebase [OPTIONS] &lt;--destination &lt;REVSETS&gt;|--insert-after &lt;REVSETS&gt;|--insert-before &lt;REVSETS&gt;&gt;</code></p>
<h6 id="options_39"><strong>Options:</strong><a class="headerlink" href="#options_39" 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> <ul>
<li> <li>
<p><code>-b</code>, <code>--branch &lt;BRANCH&gt;</code> — Rebase the whole branch relative to destination's ancestors (can be repeated)</p> <p><code>-b</code>, <code>--branch &lt;REVSETS&gt;</code> — Rebase the whole branch relative to destination's ancestors (can be repeated)</p>
<p><code>jj rebase -b=br -d=dst</code> is equivalent to <code>jj rebase '-s=roots(dst..br)' -d=dst</code>.</p> <p><code>jj rebase -b=br -d=dst</code> is equivalent to <code>jj rebase '-s=roots(dst..br)' -d=dst</code>.</p>
<p>If none of <code>-b</code>, <code>-s</code>, or <code>-r</code> is provided, then the default is <code>-b @</code>.</p> <p>If none of <code>-b</code>, <code>-s</code>, or <code>-r</code> is provided, then the default is <code>-b @</code>.</p>
</li> </li>
<li> <li>
<p><code>-s</code>, <code>--source &lt;SOURCE&gt;</code> — Rebase specified revision(s) together with their trees of descendants (can be repeated)</p> <p><code>-s</code>, <code>--source &lt;REVSETS&gt;</code> — Rebase specified revision(s) together with their trees of descendants (can be repeated)</p>
<p>Each specified revision will become a direct child of the destination revision(s), even if some of the source revisions are descendants of others.</p> <p>Each specified revision will become a direct child of the destination revision(s), even if some of the source revisions are descendants of others.</p>
<p>If none of <code>-b</code>, <code>-s</code>, or <code>-r</code> is provided, then the default is <code>-b @</code>.</p> <p>If none of <code>-b</code>, <code>-s</code>, or <code>-r</code> is provided, then the default is <code>-b @</code>.</p>
</li> </li>
<li> <li>
<p><code>-r</code>, <code>--revisions &lt;REVISIONS&gt;</code> — Rebase the given revisions, rebasing descendants onto this revision's parent(s)</p> <p><code>-r</code>, <code>--revisions &lt;REVSETS&gt;</code> — Rebase the given revisions, rebasing descendants onto this revision's parent(s)</p>
<p>Unlike <code>-s</code> or <code>-b</code>, you may <code>jj rebase -r</code> a revision <code>A</code> onto a descendant of <code>A</code>.</p> <p>Unlike <code>-s</code> or <code>-b</code>, you may <code>jj rebase -r</code> a revision <code>A</code> onto a descendant of <code>A</code>.</p>
<p>If none of <code>-b</code>, <code>-s</code>, or <code>-r</code> is provided, then the default is <code>-b @</code>.</p> <p>If none of <code>-b</code>, <code>-s</code>, or <code>-r</code> is provided, then the default is <code>-b @</code>.</p>
</li> </li>
<li> <li>
<p><code>-d</code>, <code>--destination &lt;DESTINATION&gt;</code> — The revision(s) to rebase onto (can be repeated to create a merge commit)</p> <p><code>-d</code>, <code>--destination &lt;REVSETS&gt;</code> — The revision(s) to rebase onto (can be repeated to create a merge commit)</p>
</li> </li>
<li><code>-A</code>, <code>--insert-after &lt;INSERT_AFTER&gt;</code> — The revision(s) to insert after (can be repeated to create a merge commit)</li> <li><code>-A</code>, <code>--insert-after &lt;REVSETS&gt;</code> — The revision(s) to insert after (can be repeated to create a merge commit)</li>
<li><code>-B</code>, <code>--insert-before &lt;INSERT_BEFORE&gt;</code> — The revision(s) to insert before (can be repeated to create a merge commit)</li> <li><code>-B</code>, <code>--insert-before &lt;REVSETS&gt;</code> — The revision(s) to insert before (can be repeated to create a merge commit)</li>
<li><code>--skip-emptied</code> — If true, when rebasing would produce an empty commit, the commit is abandoned. It will not be abandoned if it was already empty before the rebase. Will never skip merge commits with multiple non-empty parents</li> <li><code>--skip-emptied</code> — If true, when rebasing would produce an empty commit, the commit is abandoned. It will not be abandoned if it was already empty before the rebase. Will never skip merge commits with multiple non-empty parents</li>
</ul> </ul>
<h2 id="jj-resolve"><code>jj resolve</code><a class="headerlink" href="#jj-resolve" title="Permanent link">&para;</a></h2> <h2 id="jj-resolve"><code>jj resolve</code><a class="headerlink" href="#jj-resolve" title="Permanent link">&para;</a></h2>
<p>Resolve a conflicted file with an external merge tool</p> <p>Resolve a conflicted file with an external merge tool</p>
<p>Only conflicts that can be resolved with a 3-way merge are supported. See docs for merge tool configuration instructions.</p> <p>Only conflicts that can be resolved with a 3-way merge are supported. See docs for merge tool configuration instructions.</p>
<p>Note that conflicts can also be resolved without using this command. You may edit the conflict markers in the conflicted file directly with a text editor.</p> <p>Note that conflicts can also be resolved without using this command. You may edit the conflict markers in the conflicted file directly with a text editor.</p>
<p><strong>Usage:</strong> <code>jj resolve [OPTIONS] [PATHS]...</code></p> <p><strong>Usage:</strong> <code>jj resolve [OPTIONS] [FILESETS]...</code></p>
<h6 id="arguments_45"><strong>Arguments:</strong><a class="headerlink" href="#arguments_45" title="Permanent link">&para;</a></h6> <h6 id="arguments_45"><strong>Arguments:</strong><a class="headerlink" href="#arguments_45" title="Permanent link">&para;</a></h6>
<ul> <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> <li><code>&lt;FILESETS&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> </ul>
<h6 id="options_40"><strong>Options:</strong><a class="headerlink" href="#options_40" 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> <ul>
<li> <li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code></p> <p><code>-r</code>, <code>--revision &lt;REVSET&gt;</code></p>
<p>Default value: <code>@</code></p> <p>Default value: <code>@</code></p>
</li> </li>
<li> <li>
@ -7846,18 +7861,18 @@ commit. This is true in general; it is not specific to this command.</p>
<p>If only one of <code>--from</code> or <code>--to</code> is specified, the other one defaults to the working copy.</p> <p>If only one of <code>--from</code> or <code>--to</code> is specified, the other one defaults to the working copy.</p>
<p>When neither <code>--from</code> nor <code>--to</code> is specified, the command restores into the working copy from its parent(s). <code>jj restore</code> without arguments is similar to <code>jj abandon</code>, except that it leaves an empty revision with its description and other metadata preserved.</p> <p>When neither <code>--from</code> nor <code>--to</code> is specified, the command restores into the working copy from its parent(s). <code>jj restore</code> without arguments is similar to <code>jj abandon</code>, except that it leaves an empty revision with its description and other metadata preserved.</p>
<p>See <code>jj diffedit</code> if you'd like to restore portions of files rather than entire files.</p> <p>See <code>jj diffedit</code> if you'd like to restore portions of files rather than entire files.</p>
<p><strong>Usage:</strong> <code>jj restore [OPTIONS] [PATHS]...</code></p> <p><strong>Usage:</strong> <code>jj restore [OPTIONS] [FILESETS]...</code></p>
<h6 id="arguments_46"><strong>Arguments:</strong><a class="headerlink" href="#arguments_46" title="Permanent link">&para;</a></h6> <h6 id="arguments_46"><strong>Arguments:</strong><a class="headerlink" href="#arguments_46" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;PATHS&gt;</code> — Restore only these paths (instead of all paths)</li> <li><code>&lt;FILESETS&gt;</code> — Restore only these paths (instead of all paths)</li>
</ul> </ul>
<h6 id="options_41"><strong>Options:</strong><a class="headerlink" href="#options_41" 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> <ul>
<li><code>-f</code>, <code>--from &lt;FROM&gt;</code> — Revision to restore from (source)</li> <li><code>-f</code>, <code>--from &lt;REVSET&gt;</code> — Revision to restore from (source)</li>
<li><code>-t</code>, <code>--to &lt;TO&gt;</code> — Revision to restore into (destination)</li> <li><code>-t</code>, <code>--to &lt;REVSETS&gt;</code> — Revision to restore into (destination)</li>
<li> <li>
<p><code>-c</code>, <code>--changes-in &lt;REVISION&gt;</code> — Undo the changes in a revision as compared to the merge of its parents.</p> <p><code>-c</code>, <code>--changes-in &lt;REVSET&gt;</code> — Undo the changes in a revision as compared to the merge of its parents.</p>
<p>This undoes the changes that can be seen with <code>jj diff -r REVISION</code>. If <code>REVISION</code> only has a single parent, this option is equivalent to <code>jj restore --to REVISION --from REVISION-</code>.</p> <p>This undoes the changes that can be seen with <code>jj diff -r REVSET</code>. If <code>REVSET</code> only has a single parent, this option is equivalent to <code>jj restore --to REVSET --from REVSET-</code>.</p>
<p>The default behavior of <code>jj restore</code> is equivalent to <code>jj restore --changes-in @</code>.</p> <p>The default behavior of <code>jj restore</code> is equivalent to <code>jj restore --changes-in @</code>.</p>
</li> </li>
<li> <li>
@ -7869,11 +7884,11 @@ commit. This is true in general; it is not specific to this command.</p>
<p><strong>Usage:</strong> <code>jj root</code></p> <p><strong>Usage:</strong> <code>jj root</code></p>
<h2 id="jj-show"><code>jj show</code><a class="headerlink" href="#jj-show" title="Permanent link">&para;</a></h2> <h2 id="jj-show"><code>jj show</code><a class="headerlink" href="#jj-show" title="Permanent link">&para;</a></h2>
<p>Show commit description and changes in a revision</p> <p>Show commit description and changes in a revision</p>
<p><strong>Usage:</strong> <code>jj show [OPTIONS] [REVISION]</code></p> <p><strong>Usage:</strong> <code>jj show [OPTIONS] [REVSET]</code></p>
<h6 id="arguments_47"><strong>Arguments:</strong><a class="headerlink" href="#arguments_47" title="Permanent link">&para;</a></h6> <h6 id="arguments_47"><strong>Arguments:</strong><a class="headerlink" href="#arguments_47" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li> <li>
<p><code>&lt;REVISION&gt;</code> — Show changes in this revision, compared to its parent(s)</p> <p><code>&lt;REVSET&gt;</code> — Show changes in this revision, compared to its parent(s)</p>
<p>Default value: <code>@</code></p> <p>Default value: <code>@</code></p>
</li> </li>
</ul> </ul>
@ -7881,7 +7896,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul> <ul>
<li> <li>
<p><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render a revision using the given template</p> <p><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render a revision using the given template</p>
<p>For the syntax, see https://martinvonz.github.io/jj/latest/templates/</p> <p>For the syntax, see https://jj-vcs.github.io/jj/latest/templates/</p>
</li> </li>
<li> <li>
<p><code>-s</code>, <code>--summary</code> — For each path, show only whether it was modified, added, or deleted</p> <p><code>-s</code>, <code>--summary</code> — For each path, show only whether it was modified, added, or deleted</p>
@ -7893,7 +7908,7 @@ commit. This is true in general; it is not specific to this command.</p>
</li> </li>
<li> <li>
<p><code>--name-only</code> — For each path, show only its path</p> <p><code>--name-only</code> — For each path, show only its path</p>
<p>Typically useful for shell commands like: <code>jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g</code></p> <p>Typically useful for shell commands like: <code>jj diff -r @- --name-only | xargs perl -pi -e's/OLD/NEW/g</code></p>
</li> </li>
<li> <li>
<p><code>--git</code> — Show a Git-format diff</p> <p><code>--git</code> — Show a Git-format diff</p>
@ -7911,9 +7926,9 @@ commit. This is true in general; it is not specific to this command.</p>
<p><strong>Usage:</strong> <code>jj simplify-parents [OPTIONS]</code></p> <p><strong>Usage:</strong> <code>jj simplify-parents [OPTIONS]</code></p>
<h6 id="options_43"><strong>Options:</strong><a class="headerlink" href="#options_43" 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> <ul>
<li><code>-s</code>, <code>--source &lt;SOURCE&gt;</code> — Simplify specified revision(s) together with their trees of descendants (can be repeated)</li> <li><code>-s</code>, <code>--source &lt;REVSETS&gt;</code> — Simplify specified revision(s) together with their trees of descendants (can be repeated)</li>
<li> <li>
<p><code>-r</code>, <code>--revisions &lt;REVISIONS&gt;</code> — Simplify specified revision(s) (can be repeated)</p> <p><code>-r</code>, <code>--revisions &lt;REVSETS&gt;</code> — Simplify specified revision(s) (can be repeated)</p>
<p>If both <code>--source</code> and <code>--revisions</code> are not provided, this defaults to the <code>revsets.simplify-parents</code> setting, or <code>reachable(@, mutable())</code> if it is not set.</p> <p>If both <code>--source</code> and <code>--revisions</code> are not provided, this defaults to the <code>revsets.simplify-parents</code> setting, or <code>reachable(@, mutable())</code> if it is not set.</p>
</li> </li>
</ul> </ul>
@ -7949,20 +7964,25 @@ commit. This is true in general; it is not specific to this command.</p>
</ul> </ul>
<h2 id="jj-split"><code>jj split</code><a class="headerlink" href="#jj-split" title="Permanent link">&para;</a></h2> <h2 id="jj-split"><code>jj split</code><a class="headerlink" href="#jj-split" title="Permanent link">&para;</a></h2>
<p>Split a revision in two</p> <p>Split a revision in two</p>
<p>Starts a <a href="https://martinvonz.github.io/jj/latest/config/#editing-diffs">diff editor</a> on the changes in the revision. Edit the right side of the diff until it has the content you want in the first revision. Once you close the editor, your edited content will replace the previous revision. The remaining changes will be put in a new revision on top.</p> <p>Starts a <a href="https://jj-vcs.github.io/jj/latest/config/#editing-diffs">diff editor</a> on the changes in the revision. Edit the right side of the diff until it has the content you want in the first revision. Once you close the editor, your edited content will replace the previous revision. The remaining changes will be put in a new revision on top.</p>
<p>If the change you split had a description, you will be asked to enter a change description for each commit. If the change did not have a description, the second part will not get a description, and you will be asked for a description only for the first part.</p> <p>If the change you split had a description, you will be asked to enter a change description for each commit. If the change did not have a description, the second part will not get a description, and you will be asked for a description only for the first part.</p>
<p>Splitting an empty commit is not supported because the same effect can be achieved with <code>jj new</code>.</p> <p>Splitting an empty commit is not supported because the same effect can be achieved with <code>jj new</code>.</p>
<p><strong>Usage:</strong> <code>jj split [OPTIONS] [PATHS]...</code></p> <p><strong>Usage:</strong> <code>jj split [OPTIONS] [FILESETS]...</code></p>
<h6 id="arguments_48"><strong>Arguments:</strong><a class="headerlink" href="#arguments_48" title="Permanent link">&para;</a></h6> <h6 id="arguments_48"><strong>Arguments:</strong><a class="headerlink" href="#arguments_48" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;PATHS&gt;</code> — Put these paths in the first commit</li> <li><code>&lt;FILESETS&gt;</code> — Files matching any of these filesets are put in the first commit</li>
</ul> </ul>
<h6 id="options_45"><strong>Options:</strong><a class="headerlink" href="#options_45" 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> <ul>
<li><code>-i</code>, <code>--interactive</code> — Interactively choose which parts to split. This is the default if no paths are provided</li>
<li><code>--tool &lt;NAME&gt;</code> — Specify diff editor to be used (implies --interactive)</li>
<li> <li>
<p><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — The revision to split</p> <p><code>-i</code>, <code>--interactive</code> — Interactively choose which parts to split</p>
<p>This is the default if no filesets are provided.</p>
</li>
<li>
<p><code>--tool &lt;NAME&gt;</code> — Specify diff editor to be used (implies --interactive)</p>
</li>
<li>
<p><code>-r</code>, <code>--revision &lt;REVSET&gt;</code> — The revision to split</p>
<p>Default value: <code>@</code></p> <p>Default value: <code>@</code></p>
</li> </li>
<li> <li>
@ -7976,16 +7996,16 @@ commit. This is true in general; it is not specific to this command.</p>
<p>If, after moving changes out, the source revision is empty compared to its parent(s), and <code>--keep-emptied</code> is not set, it will be abandoned. Without <code>--interactive</code> or paths, the source revision will always be empty.</p> <p>If, after moving changes out, the source revision is empty compared to its parent(s), and <code>--keep-emptied</code> is not set, it will be abandoned. Without <code>--interactive</code> or paths, the source revision will always be empty.</p>
<p>If the source was abandoned 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 the source was abandoned 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>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 squash [OPTIONS] [PATHS]...</code></p> <p><strong>Usage:</strong> <code>jj squash [OPTIONS] [FILESETS]...</code></p>
<h6 id="arguments_49"><strong>Arguments:</strong><a class="headerlink" href="#arguments_49" title="Permanent link">&para;</a></h6> <h6 id="arguments_49"><strong>Arguments:</strong><a class="headerlink" href="#arguments_49" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;PATHS&gt;</code> — Move only changes to these paths (instead of all paths)</li> <li><code>&lt;FILESETS&gt;</code> — Move only changes to these paths (instead of all paths)</li>
</ul> </ul>
<h6 id="options_46"><strong>Options:</strong><a class="headerlink" href="#options_46" 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> <ul>
<li><code>-r</code>, <code>--revision &lt;REVISION&gt;</code> — Revision to squash into its parent (default: @)</li> <li><code>-r</code>, <code>--revision &lt;REVSET&gt;</code> — Revision to squash into its parent (default: @)</li>
<li><code>-f</code>, <code>--from &lt;FROM&gt;</code> — Revision(s) to squash from (default: @)</li> <li><code>-f</code>, <code>--from &lt;REVSETS&gt;</code> — Revision(s) to squash from (default: @)</li>
<li><code>-t</code>, <code>--into &lt;INTO&gt;</code> — Revision to squash into (default: @)</li> <li><code>-t</code>, <code>--into &lt;REVSET&gt;</code> — Revision to squash into (default: @)</li>
<li><code>-m</code>, <code>--message &lt;MESSAGE&gt;</code> — The description to use for squashed revision (don't open editor)</li> <li><code>-m</code>, <code>--message &lt;MESSAGE&gt;</code> — The description to use for squashed revision (don't open editor)</li>
<li><code>-u</code>, <code>--use-destination-message</code> — Use the description of the destination revision and discard the description(s) of the source revision(s)</li> <li><code>-u</code>, <code>--use-destination-message</code> — Use the description of the destination revision and discard the description(s) of the source revision(s)</li>
<li><code>-i</code>, <code>--interactive</code> — Interactively choose which parts to squash</li> <li><code>-i</code>, <code>--interactive</code> — Interactively choose which parts to squash</li>
@ -7996,12 +8016,12 @@ commit. This is true in general; it is not specific to this command.</p>
<p>Show high-level repo status</p> <p>Show high-level repo status</p>
<p>This includes:</p> <p>This includes:</p>
<ul> <ul>
<li>The working copy commit and its (first) parent, and a summary of the changes between them * Conflicted bookmarks (see https://martinvonz.github.io/jj/latest/bookmarks/)</li> <li>The working copy commit and its (first) parent, and a summary of the changes between them * Conflicted bookmarks (see https://jj-vcs.github.io/jj/latest/bookmarks/)</li>
</ul> </ul>
<p><strong>Usage:</strong> <code>jj status [PATHS]...</code></p> <p><strong>Usage:</strong> <code>jj status [FILESETS]...</code></p>
<h6 id="arguments_50"><strong>Arguments:</strong><a class="headerlink" href="#arguments_50" title="Permanent link">&para;</a></h6> <h6 id="arguments_50"><strong>Arguments:</strong><a class="headerlink" href="#arguments_50" title="Permanent link">&para;</a></h6>
<ul> <ul>
<li><code>&lt;PATHS&gt;</code> — Restrict the status display to these paths</li> <li><code>&lt;FILESETS&gt;</code> — Restrict the status display to these paths</li>
</ul> </ul>
<h2 id="jj-tag"><code>jj tag</code><a class="headerlink" href="#jj-tag" title="Permanent link">&para;</a></h2> <h2 id="jj-tag"><code>jj tag</code><a class="headerlink" href="#jj-tag" title="Permanent link">&para;</a></h2>
<p>Manage tags</p> <p>Manage tags</p>
@ -8017,7 +8037,7 @@ commit. This is true in general; it is not specific to this command.</p>
<ul> <ul>
<li> <li>
<p><code>&lt;NAMES&gt;</code> — Show tags whose local name matches</p> <p><code>&lt;NAMES&gt;</code> — Show tags whose local name matches</p>
<p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select tags by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.</p> <p>By default, the specified name matches exactly. Use <code>glob:</code> prefix to select tags by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.</p>
</li> </li>
</ul> </ul>
<h6 id="options_47"><strong>Options:</strong><a class="headerlink" href="#options_47" 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>
@ -8025,7 +8045,7 @@ commit. This is true in general; it is not specific to this command.</p>
<li> <li>
<p><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render each tag using the given template</p> <p><code>-T</code>, <code>--template &lt;TEMPLATE&gt;</code> — Render each tag using the given template</p>
<p>All 0-argument methods of the <code>RefName</code> type are available as keywords.</p> <p>All 0-argument methods of the <code>RefName</code> type are available as keywords.</p>
<p>For the syntax, see https://martinvonz.github.io/jj/latest/templates/</p> <p>For the syntax, see https://jj-vcs.github.io/jj/latest/templates/</p>
</li> </li>
</ul> </ul>
<h2 id="jj-util"><code>jj util</code><a class="headerlink" href="#jj-util" title="Permanent link">&para;</a></h2> <h2 id="jj-util"><code>jj util</code><a class="headerlink" href="#jj-util" title="Permanent link">&para;</a></h2>
@ -8183,7 +8203,7 @@ inline it into your config file:</p>
<p>To override the default, which is the basename of the destination directory.</p> <p>To override the default, which is the basename of the destination directory.</p>
</li> </li>
<li> <li>
<p><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.</p> <p><code>-r</code>, <code>--revision &lt;REVSETS&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.</p>
<p>If no revisions are specified, the new workspace will be created, and its working-copy commit will exist on top of the parent(s) of the working-copy commit in the current workspace, i.e. they will share the same parent(s).</p> <p>If no revisions are specified, the new workspace will be created, and its working-copy commit will exist on top of the parent(s) of the working-copy commit in the current workspace, i.e. they will share the same parent(s).</p>
<p>If any revisions are specified, the new workspace will be created, and the new working-copy commit will be created with all these revisions as parents, i.e. the working-copy commit will exist as if you had run <code>jj new r1 r2 r3 ...</code>.</p> <p>If any revisions are specified, the new workspace will be created, and the new working-copy commit will be created with all these revisions as parents, i.e. the working-copy commit will exist as if you had run <code>jj new r1 r2 r3 ...</code>.</p>
</li> </li>
@ -8224,7 +8244,7 @@ inline it into your config file:</p>
<p><strong>Usage:</strong> <code>jj workspace root</code></p> <p><strong>Usage:</strong> <code>jj workspace root</code></p>
<h2 id="jj-workspace-update-stale"><code>jj workspace update-stale</code><a class="headerlink" href="#jj-workspace-update-stale" title="Permanent link">&para;</a></h2> <h2 id="jj-workspace-update-stale"><code>jj workspace update-stale</code><a class="headerlink" href="#jj-workspace-update-stale" title="Permanent link">&para;</a></h2>
<p>Update a workspace that has become stale</p> <p>Update a workspace that has become stale</p>
<p>For information about stale working copies, see https://martinvonz.github.io/jj/latest/working-copy/.</p> <p>For information about stale working copies, see https://jj-vcs.github.io/jj/latest/working-copy/.</p>
<p><strong>Usage:</strong> <code>jj workspace update-stale</code></p> <p><strong>Usage:</strong> <code>jj workspace update-stale</code></p>
<hr/> <hr/>

2
latest/code-of-conduct/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/code-of-conduct/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/code-of-conduct/">
<link rel="prev" href="../contributing/"> <link rel="prev" href="../contributing/">

4
latest/community_tools/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/community_tools/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/community_tools/">
<link rel="prev" href="../testimonials/"> <link rel="prev" href="../testimonials/">
@ -1583,7 +1583,7 @@ VisualJJ is not open-source.</p>
<!-- TODO: Add benbrittains/cultivate when its ready --> <!-- TODO: Add benbrittains/cultivate when its ready -->
<h2 id="finding-other-integrations">Finding other integrations<a class="headerlink" href="#finding-other-integrations" title="Permanent link">&para;</a></h2> <h2 id="finding-other-integrations">Finding other integrations<a class="headerlink" href="#finding-other-integrations" title="Permanent link">&para;</a></h2>
<p>You can find other community contributed tools and integrations in our <p>You can find other community contributed tools and integrations in our
<a href="https://github.com/martinvonz/jj/wiki">Wiki</a>.</p> <a href="https://github.com/jj-vcs/jj/wiki">Wiki</a>.</p>

131
latest/config/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/config/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/config/">
<link rel="prev" href="../glossary/"> <link rel="prev" href="../glossary/">
@ -709,9 +709,9 @@
<ul class="md-nav__list"> <ul class="md-nav__list">
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#dotted-style-and-headings" class="md-nav__link"> <a href="#dotted-style-headings-and-inline-tables" class="md-nav__link">
<span class="md-ellipsis"> <span class="md-ellipsis">
Dotted style and headings Dotted style, headings, and inline tables
</span> </span>
</a> </a>
@ -937,6 +937,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#commit-timestamp" class="md-nav__link">
<span class="md-ellipsis">
Commit timestamp
</span>
</a>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -1288,6 +1297,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#conditional-variables" class="md-nav__link">
<span class="md-ellipsis">
Conditional variables
</span>
</a>
</li> </li>
</ul> </ul>
@ -1977,9 +1995,9 @@
<ul class="md-nav__list"> <ul class="md-nav__list">
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#dotted-style-and-headings" class="md-nav__link"> <a href="#dotted-style-headings-and-inline-tables" class="md-nav__link">
<span class="md-ellipsis"> <span class="md-ellipsis">
Dotted style and headings Dotted style, headings, and inline tables
</span> </span>
</a> </a>
@ -2205,6 +2223,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#commit-timestamp" class="md-nav__link">
<span class="md-ellipsis">
Commit timestamp
</span>
</a>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -2556,6 +2583,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#conditional-variables" class="md-nav__link">
<span class="md-ellipsis">
Conditional variables
</span>
</a>
</li> </li>
</ul> </ul>
@ -2601,14 +2637,13 @@ located in <code>.jj/repo/config.toml</code>.</p>
</li> </li>
</ul> </ul>
<p>These are listed in the order they are loaded; the settings from earlier items <p>These are listed in the order they are loaded; the settings from earlier items
in in the list are overridden by the settings from later items if they disagree.
the list are overridden by the settings from later items if they disagree. Every Every type of config except for the built-in settings is optional.</p>
type of config except for the built-in settings is optional.</p>
<p>See the <a href="https://toml.io/en/">TOML site</a> and the <a href="https://toml.io/en/v1.0.0">syntax guide</a> for a detailed description of the <p>See the <a href="https://toml.io/en/">TOML site</a> and the <a href="https://toml.io/en/v1.0.0">syntax guide</a> for a detailed description of the
syntax. We cover some of the basics below.</p> syntax. We cover some of the basics below.</p>
<p>The first thing to remember is that the value of a setting (the part to the <p>The first thing to remember is that the value of a setting (the part to the
right of the <code>=</code> sign) should be surrounded in quotes if it's a string.</p> right of the <code>=</code> sign) should be surrounded in quotes if it's a string.</p>
<h3 id="dotted-style-and-headings">Dotted style and headings<a class="headerlink" href="#dotted-style-and-headings" title="Permanent link">&para;</a></h3> <h3 id="dotted-style-headings-and-inline-tables">Dotted style, headings, and inline tables<a class="headerlink" href="#dotted-style-headings-and-inline-tables" title="Permanent link">&para;</a></h3>
<p>In TOML, anything under a heading can be dotted instead. For example, <p>In TOML, anything under a heading can be dotted instead. For example,
<code>user.name = "YOUR NAME"</code> is equivalent to:</p> <code>user.name = "YOUR NAME"</code> is equivalent to:</p>
<div class="highlight"><pre><span></span><code><span class="k">[user]</span> <div class="highlight"><pre><span></span><code><span class="k">[user]</span>
@ -2617,7 +2652,7 @@ right of the <code>=</code> sign) should be surrounded in quotes if it's a strin
<p>For future reference, here are a couple of more complicated examples,</p> <p>For future reference, here are a couple of more complicated examples,</p>
<div class="highlight"><pre><span></span><code><span class="c1"># Dotted style</span> <div class="highlight"><pre><span></span><code><span class="c1"># Dotted style</span>
<span class="n">template-aliases</span><span class="p">.</span><span class="s2">&quot;format_short_id(id)&quot;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;id.shortest(12)&quot;</span> <span class="n">template-aliases</span><span class="p">.</span><span class="s2">&quot;format_short_id(id)&quot;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;id.shortest(12)&quot;</span>
<span class="n">colors</span><span class="p">.</span><span class="s2">&quot;commit_id prefix&quot;</span><span class="p">.</span><span class="n">bold</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">true</span> <span class="n">colors</span><span class="p">.</span><span class="s2">&quot;commit_id prefix&quot;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">bold</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">true</span><span class="w"> </span><span class="p">}</span>
<span class="c1"># is equivalent to:</span> <span class="c1"># is equivalent to:</span>
<span class="k">[template-aliases]</span> <span class="k">[template-aliases]</span>
@ -2626,6 +2661,13 @@ right of the <code>=</code> sign) should be surrounded in quotes if it's a strin
<span class="k">[colors]</span> <span class="k">[colors]</span>
<span class="s2">&quot;commit_id prefix&quot;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">bold</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">true</span><span class="w"> </span><span class="p">}</span> <span class="s2">&quot;commit_id prefix&quot;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">bold</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">true</span><span class="w"> </span><span class="p">}</span>
</code></pre></div> </code></pre></div>
<p>Dotted and non-inline table items are merged one by one if the same keys exist
in multiple files. In the example above, <code>template-aliases</code> and <code>colors</code> are
the tables to be merged. <code>template-aliases."format_short_id(id)"</code> and
<code>colors."commit_id prefix"</code> in the default settings are overridden. On the other
hand, inner items of an inline table are <em>not</em> merged. For example, <code>{ bold =
true }</code> wouldn't be merged as <code>{ fg = "blue", bold = true }</code> even if the default
settings had <code>colors."commit_id prefix" = { fg = "blue" }</code>.</p>
<p>The docs below refer to keys in text using dotted notation, but example <p>The docs below refer to keys in text using dotted notation, but example
blocks will use heading notation to be unambiguous. If you are confident with TOML blocks will use heading notation to be unambiguous. If you are confident with TOML
then use whichever suits you in your config. If you mix dotted keys and headings, then use whichever suits you in your config. If you mix dotted keys and headings,
@ -2687,9 +2729,9 @@ this:</p>
<span class="s2">&quot;working_copy commit_id&quot;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">underline</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">true</span><span class="w"> </span><span class="p">}</span> <span class="s2">&quot;working_copy commit_id&quot;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">underline</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">true</span><span class="w"> </span><span class="p">}</span>
</code></pre></div> </code></pre></div>
<p>Parts of the style that are not overridden - such as the foreground color in the <p>Parts of the style that are not overridden - such as the foreground color in the
example above - are inherited from the parent style.</p> example above - are inherited from the style of the parent label.</p>
<p>Which elements can be colored is not yet documented, but see <p>Which elements can be colored is not yet documented, but see
the <a href="https://github.com/martinvonz/jj/blob/main/cli/src/config/colors.toml">default color configuration</a> the <a href="https://github.com/jj-vcs/jj/blob/main/cli/src/config/colors.toml">default color configuration</a>
for some examples of what's possible.</p> for some examples of what's possible.</p>
<h3 id="default-command">Default command<a class="headerlink" href="#default-command" title="Permanent link">&para;</a></h3> <h3 id="default-command">Default command<a class="headerlink" href="#default-command" title="Permanent link">&para;</a></h3>
<p>When <code>jj</code> is run with no explicit subcommand, the value of the <p>When <code>jj</code> is run with no explicit subcommand, the value of the
@ -2709,6 +2751,8 @@ subcommand name, subcommand alias, or user-defined alias (defaults to <code>"log
<span class="s1"> &quot;\nJJ: This commit contains the following changes:\n&quot;, &quot;&quot;,</span> <span class="s1"> &quot;\nJJ: This commit contains the following changes:\n&quot;, &quot;&quot;,</span>
<span class="s1"> indent(&quot;JJ: &quot;, diff.stat(72)),</span> <span class="s1"> indent(&quot;JJ: &quot;, diff.stat(72)),</span>
<span class="s1"> ),</span> <span class="s1"> ),</span>
<span class="s1"> &quot;\nJJ: ignore-rest\n&quot;,</span>
<span class="s1"> diff.git(),</span>
<span class="s1">)</span> <span class="s1">)</span>
<span class="s1">&#39;&#39;&#39;</span> <span class="s1">&#39;&#39;&#39;</span>
</code></pre></div> </code></pre></div>
@ -2844,7 +2888,7 @@ immutable even if the set is empty.</p>
<span class="c1"># Use builtin log template</span> <span class="c1"># Use builtin log template</span>
<span class="n">log</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;builtin_log_compact&quot;</span> <span class="n">log</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;builtin_log_compact&quot;</span>
<span class="c1"># Use builtin op log template</span> <span class="c1"># Use builtin op log template</span>
<span class="n">op_log</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;builtin_log_compact&quot;</span> <span class="n">op_log</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;builtin_op_log_compact&quot;</span>
<span class="c1"># Use builtin show template</span> <span class="c1"># Use builtin show template</span>
<span class="n">show</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;builtin_log_detailed&quot;</span> <span class="n">show</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;builtin_log_detailed&quot;</span>
</code></pre></div> </code></pre></div>
@ -2929,6 +2973,15 @@ will need to modify the <code>format_time_range()</code> template alias.</p>
<span class="c1"># Username part of the email address</span> <span class="c1"># Username part of the email address</span>
<span class="s1">&#39;format_short_signature(signature)&#39;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s1">&#39;signature.username()&#39;</span> <span class="s1">&#39;format_short_signature(signature)&#39;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s1">&#39;signature.username()&#39;</span>
</code></pre></div> </code></pre></div>
<h3 id="commit-timestamp">Commit timestamp<a class="headerlink" href="#commit-timestamp" title="Permanent link">&para;</a></h3>
<p>Commits have both an "author timestamp" and "committer timestamp". By default,
jj displays the committer timestamp, but can be changed to show the author
timestamp instead.</p>
<p>The function must return a timestamp because the return value will likely be
formatted with <code>format_timestamp()</code>.</p>
<div class="highlight"><pre><span></span><code><span class="k">[template-aliases]</span>
<span class="s1">&#39;commit_timestamp(commit)&#39;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s1">&#39;commit.author().timestamp()&#39;</span>
</code></pre></div>
<h3 id="allow-large-revsets-by-default">Allow "large" revsets by default<a class="headerlink" href="#allow-large-revsets-by-default" title="Permanent link">&para;</a></h3> <h3 id="allow-large-revsets-by-default">Allow "large" revsets by default<a class="headerlink" href="#allow-large-revsets-by-default" title="Permanent link">&para;</a></h3>
<p>Certain commands (such as <code>jj rebase</code>) can take multiple revset arguments, but <p>Certain commands (such as <code>jj rebase</code>) can take multiple revset arguments, but
default to requiring each of those revsets to expand to a <em>single</em> revision. default to requiring each of those revsets to expand to a <em>single</em> revision.
@ -3159,7 +3212,7 @@ this file will be ignored. To suppress the creation of this file, set
<code>ui.diff-instructions = false</code>.</p> <code>ui.diff-instructions = false</code>.</p>
<h3 id="using-vim-as-a-diff-editor">Using Vim as a diff editor<a class="headerlink" href="#using-vim-as-a-diff-editor" title="Permanent link">&para;</a></h3> <h3 id="using-vim-as-a-diff-editor">Using Vim as a diff editor<a class="headerlink" href="#using-vim-as-a-diff-editor" title="Permanent link">&para;</a></h3>
<p>Using <code>ui.diff-editor = "vimdiff"</code> is possible but not recommended. For a better <p>Using <code>ui.diff-editor = "vimdiff"</code> is possible but not recommended. For a better
experience, you can follow <a href="https://github.com/martinvonz/jj/wiki/Vim#using-vim-as-a-diff-tool">instructions from the Wiki</a> to configure the experience, you can follow <a href="https://github.com/jj-vcs/jj/wiki/Vim#using-vim-as-a-diff-tool">instructions from the Wiki</a> to configure the
<a href="https://github.com/will133/vim-dirdiff">DirDiff Vim plugin</a> and/or the <a href="https://github.com/balki/vimtabdiff">vimtabdiff Python script</a>.</p> <a href="https://github.com/will133/vim-dirdiff">DirDiff Vim plugin</a> and/or the <a href="https://github.com/balki/vimtabdiff">vimtabdiff Python script</a>.</p>
<h2 id="3-way-merge-tools-for-conflict-resolution">3-way merge tools for conflict resolution<a class="headerlink" href="#3-way-merge-tools-for-conflict-resolution" title="Permanent link">&para;</a></h2> <h2 id="3-way-merge-tools-for-conflict-resolution">3-way merge tools for conflict resolution<a class="headerlink" href="#3-way-merge-tools-for-conflict-resolution" title="Permanent link">&para;</a></h2>
<p>The <code>ui.merge-editor</code> key specifies the tool used for three-way merge tools <p>The <code>ui.merge-editor</code> key specifies the tool used for three-way merge tools
@ -3209,6 +3262,12 @@ to copy it to your config file verbatim, but you are welcome to customize it.)</
<p><code>$base</code> is replaced with the path to a file containing the contents of the <p><code>$base</code> is replaced with the path to a file containing the contents of the
conflicted file in the last common ancestor of the two sides of the conflict.</p> conflicted file in the last common ancestor of the two sides of the conflict.</p>
</li> </li>
<li>
<p><code>$marker_length</code> is replaced with the length of the conflict markers which
should be used for the file. This can be useful if the merge tool parses
and/or generates conflict markers. Usually, <code>jj</code> uses conflict markers of
length 7, but they can be longer if necessary to make parsing unambiguous.</p>
</li>
</ul> </ul>
<h3 id="editing-conflict-markers-with-a-tool-or-a-text-editor">Editing conflict markers with a tool or a text editor<a class="headerlink" href="#editing-conflict-markers-with-a-tool-or-a-text-editor" title="Permanent link">&para;</a></h3> <h3 id="editing-conflict-markers-with-a-tool-or-a-text-editor">Editing conflict markers with a tool or a text editor<a class="headerlink" href="#editing-conflict-markers-with-a-tool-or-a-text-editor" title="Permanent link">&para;</a></h3>
<p>By default, the merge tool starts with an empty output file. If the tool puts <p>By default, the merge tool starts with an empty output file. If the tool puts
@ -3480,18 +3539,42 @@ default locations. For example,</p>
<div class="highlight"><pre><span></span><code>env<span class="w"> </span><span class="nv">JJ_CONFIG</span><span class="o">=</span>/dev/null<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span><span class="c1"># Ignores any settings specified in the config file.</span> <div class="highlight"><pre><span></span><code>env<span class="w"> </span><span class="nv">JJ_CONFIG</span><span class="o">=</span>/dev/null<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span><span class="c1"># Ignores any settings specified in the config file.</span>
</code></pre></div> </code></pre></div>
<h3 id="specifying-config-on-the-command-line">Specifying config on the command-line<a class="headerlink" href="#specifying-config-on-the-command-line" title="Permanent link">&para;</a></h3> <h3 id="specifying-config-on-the-command-line">Specifying config on the command-line<a class="headerlink" href="#specifying-config-on-the-command-line" title="Permanent link">&para;</a></h3>
<p>You can use one or more <code>--config-toml</code> options on the command line to specify <p>You can use one or more <code>--config</code>/<code>--config-file</code> options on the command line
additional configuration settings. This overrides settings defined in config to specify additional configuration settings. This overrides settings defined in
files or environment variables. For example,</p> config files or environment variables. For example,</p>
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>--config-toml<span class="o">=</span><span class="s1">&#39;ui.color=&quot;always&quot;&#39;</span><span class="w"> </span>--config-toml<span class="o">=</span><span class="s1">&#39;ui.diff-editor=&quot;kdiff3&quot;&#39;</span><span class="w"> </span>split <div class="highlight"><pre><span></span><code>jj<span class="w"> </span>--config<span class="o">=</span>ui.color<span class="o">=</span>always<span class="w"> </span>--config<span class="o">=</span>ui.diff-editor<span class="o">=</span>kdiff3<span class="w"> </span>split
</code></pre></div> </code></pre></div>
<p>Config specified this way must be valid TOML. In particular, string values must <p>Config value should be specified as a TOML expression. If string value doesn't
be surrounded by quotes. To pass these quotes to <code>jj</code>, most shells require contain any TOML constructs (such as array notation), quotes can be omitted.</p>
surrounding those quotes with single quotes as shown above.</p> <p>To load an entire TOML document, use <code>--config-file</code>:</p>
<p>In <code>sh</code>-compatible shells, <code>--config-toml</code> can be used to merge entire TOML <div class="highlight"><pre><span></span><code>jj<span class="w"> </span>--config-file<span class="o">=</span>extra-config.toml<span class="w"> </span>log
files with the config specified in <code>.jjconfig.toml</code>:</p>
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>--config-toml<span class="o">=</span><span class="s2">&quot;</span><span class="k">$(</span>cat<span class="w"> </span>extra-config.toml<span class="k">)</span><span class="s2">&quot;</span><span class="w"> </span>log
</code></pre></div> </code></pre></div>
<h3 id="conditional-variables">Conditional variables<a class="headerlink" href="#conditional-variables" title="Permanent link">&para;</a></h3>
<p>You can conditionally enable config variables by using <code>--when</code> and
<code>[[--scope]]</code> tables. Variables defined in <code>[[--scope]]</code> tables are expanded to
the root table. <code>--when</code> specifies the condition to enable the scope table.</p>
<div class="highlight"><pre><span></span><code><span class="k">[user]</span>
<span class="n">name</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;YOUR NAME&quot;</span>
<span class="n">email</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;YOUR_DEFAULT_EMAIL@example.com&quot;</span>
<span class="c1"># override user.email if the repository is located under ~/oss</span>
<span class="k">[[--scope]]</span>
<span class="n">--when</span><span class="p">.</span><span class="n">repositories</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">[</span><span class="s2">&quot;~/oss&quot;</span><span class="p">]</span>
<span class="k">[--scope.user]</span>
<span class="n">email</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;YOUR_OSS_EMAIL@example.org&quot;</span>
</code></pre></div>
<p>Condition keys:</p>
<ul>
<li><code>--when.repositories</code>: List of paths to match the repository path prefix.</li>
</ul>
<p>Paths should be absolute. Each path component (directory or file name, drive
letter, etc.) is compared case-sensitively on all platforms. A path starting
with <code>~</code> is expanded to the home directory. On Windows, directory separator may
be either <code>\</code> or <code>/</code>. (Beware that <code>\</code> needs escape in double-quoted strings.)</p>
<p>Use <code>jj root</code> to see the workspace root directory. Note that the repository path
is in the main workspace if you're using multiple workspaces with <code>jj
workspace</code>.</p>
<p>If no conditions are specified, table is always enabled.</p>

36
latest/conflicts/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/conflicts/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/conflicts/">
<link rel="prev" href="../bookmarks/"> <link rel="prev" href="../bookmarks/">
@ -627,6 +627,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#long-conflict-markers" class="md-nav__link">
<span class="md-ellipsis">
Long conflict markers
</span>
</a>
</li> </li>
</ul> </ul>
@ -1439,6 +1448,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#long-conflict-markers" class="md-nav__link">
<span class="md-ellipsis">
Long conflict markers
</span>
</a>
</li> </li>
</ul> </ul>
@ -1593,6 +1611,22 @@ ORANGE
<p>This conflict marker style only supports 2-sided conflicts though, so it falls <p>This conflict marker style only supports 2-sided conflicts though, so it falls
back to the similar "snapshot" conflict markers if there are more than 2 sides back to the similar "snapshot" conflict markers if there are more than 2 sides
to the conflict.</p> to the conflict.</p>
<h2 id="long-conflict-markers">Long conflict markers<a class="headerlink" href="#long-conflict-markers" title="Permanent link">&para;</a></h2>
<p>Some files may contain lines which could be confused for conflict markers. For
instance, a line could start with <code>=======</code>, which looks like a Git-style
conflict marker. To ensure that it's always unambiguous which lines are conflict
markers and which are just part of the file contents, <code>jj</code> sometimes uses
conflict markers which are longer than normal:</p>
<div class="highlight"><pre><span></span><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt; Conflict 1 of 1
%%%%%%%%%%%%%%% Changes from base to side #1
-Heading
+HEADING
=======
+++++++++++++++ Contents of side #2
New Heading
===========
&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt; Conflict 1 of 1 ends
</code></pre></div>

45
latest/contributing/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/contributing/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/contributing/">
<link rel="prev" href="../technical/conflicts/"> <link rel="prev" href="../technical/conflicts/">
@ -1263,6 +1263,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#logging" class="md-nav__link">
<span class="md-ellipsis">
Logging
</span>
</a>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -1796,6 +1805,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#logging" class="md-nav__link">
<span class="md-ellipsis">
Logging
</span>
</a>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -1888,9 +1906,9 @@ existing component, we require an architecture review from multiple
stakeholders, which we do with <a href="../design_docs/">Design Docs</a>, see the stakeholders, which we do with <a href="../design_docs/">Design Docs</a>, see the
<a href="../design_docs/#process">process here</a>.</p> <a href="../design_docs/#process">process here</a>.</p>
<h2 id="contributing-to-the-documentation">Contributing to the documentation<a class="headerlink" href="#contributing-to-the-documentation" title="Permanent link">&para;</a></h2> <h2 id="contributing-to-the-documentation">Contributing to the documentation<a class="headerlink" href="#contributing-to-the-documentation" title="Permanent link">&para;</a></h2>
<p>We appreciate <a href="https://github.com/martinvonz/jj/issues/new?template=bug_report.md">bug <p>We appreciate <a href="https://github.com/jj-vcs/jj/issues/new?template=bug_report.md">bug
reports</a> reports</a>
about any problems, however small, lurking in <a href="https://martinvonz.github.io/jj/prerelease">our documentation about any problems, however small, lurking in <a href="https://jj-vcs.github.io/jj/prerelease">our documentation
website</a> or in the <code>jj help website</a> or in the <code>jj help
&lt;command&gt;</code> docs. If a part of the bug report template does not apply, you can &lt;command&gt;</code> docs. If a part of the bug report template does not apply, you can
just delete it.</p> just delete it.</p>
@ -1899,13 +1917,13 @@ you could check that the problem still exists in the "prerelease" version of the
documentation (as opposed to the docs for one of the released versions of <code>jj</code>). documentation (as opposed to the docs for one of the released versions of <code>jj</code>).
You can use the version switcher in the top-left of the website to do so.</p> You can use the version switcher in the top-left of the website to do so.</p>
<p>If you are willing to make a PR fixing a documentation problem, even better!</p> <p>If you are willing to make a PR fixing a documentation problem, even better!</p>
<p>The documentation website sources are Markdown files located in the <a href="https://github.com/martinvonz/jj/tree/main/docs"><code>docs/</code> <p>The documentation website sources are Markdown files located in the <a href="https://github.com/jj-vcs/jj/tree/main/docs"><code>docs/</code>
directory</a>. You do not need to directory</a>. You do not need to
know Rust to work with them. See below for <a href="#previewing-the-html-documentation">instructions on how to preview the know Rust to work with them. See below for <a href="#previewing-the-html-documentation">instructions on how to preview the
HTML docs</a> as you edit the Markdown files. HTML docs</a> as you edit the Markdown files.
Doing so is optional, but recommended.</p> Doing so is optional, but recommended.</p>
<p>The <code>jj help</code> docs are sourced from the "docstring" comments inside the Rust <p>The <code>jj help</code> docs are sourced from the "docstring" comments inside the Rust
sources, currently from the <a href="https://github.com/martinvonz/jj/tree/main/cli/src/commands"><code>cli/src/commands</code> sources, currently from the <a href="https://github.com/jj-vcs/jj/tree/main/cli/src/commands"><code>cli/src/commands</code>
directory</a>. Working directory</a>. Working
on them requires setting up a Rust development environment, as described on them requires setting up a Rust development environment, as described
below, and may occasionally require adjusting a test.</p> below, and may occasionally require adjusting a test.</p>
@ -1940,10 +1958,13 @@ cargo nextest run --workspace # Occasionally
cargo insta test --workspace --test-runner nextest # Occasionally cargo insta test --workspace --test-runner nextest # Occasionally
</code></pre></div> </code></pre></div>
<p>WARNING: Build artifacts from debug builds and especially from repeated <div class="admonition warning">
<p class="admonition-title">Warning</p>
<p>Build artifacts from debug builds and especially from repeated
invocations of <code>cargo test</code> can quickly take up 10s of GB of disk space. invocations of <code>cargo test</code> can quickly take up 10s of GB of disk space.
Cargo will happily use up your entire hard drive. If this happens, run Cargo will happily use up your entire hard drive. If this happens, run
<code>cargo clean</code>.</p> <code>cargo clean</code>.</p>
</div>
<h3 id="explanation">Explanation<a class="headerlink" href="#explanation" title="Permanent link">&para;</a></h3> <h3 id="explanation">Explanation<a class="headerlink" href="#explanation" title="Permanent link">&para;</a></h3>
<p>These are listed roughly in order of decreasing importance.</p> <p>These are listed roughly in order of decreasing importance.</p>
<ol> <ol>
@ -2049,7 +2070,7 @@ multi-threaded. It should use all the CPU cores without any configuration.</p>
</code></pre></div> </code></pre></div>
<h2 id="previewing-the-html-documentation">Previewing the HTML documentation<a class="headerlink" href="#previewing-the-html-documentation" title="Permanent link">&para;</a></h2> <h2 id="previewing-the-html-documentation">Previewing the HTML documentation<a class="headerlink" href="#previewing-the-html-documentation" title="Permanent link">&para;</a></h2>
<p>The documentation for <code>jj</code> is automatically published online at <p>The documentation for <code>jj</code> is automatically published online at
<a href="https://martinvonz.github.io/jj/">https://martinvonz.github.io/jj/</a>.</p> <a href="https://jj-vcs.github.io/jj/">https://jj-vcs.github.io/jj/</a>.</p>
<p>When editing documentation, you should check your changes locally — especially <p>When editing documentation, you should check your changes locally — especially
if you are adding a new page, or doing a major rewrite.</p> if you are adding a new page, or doing a major rewrite.</p>
<h3 id="install-uv">Install <code>uv</code><a class="headerlink" href="#install-uv" title="Permanent link">&para;</a></h3> <h3 id="install-uv">Install <code>uv</code><a class="headerlink" href="#install-uv" title="Permanent link">&para;</a></h3>
@ -2113,8 +2134,8 @@ documentation that we currently do with <code>mike</code>.</p>
</div> </div>
<p>The full <code>jj</code> website includes the documentation for several <code>jj</code> versions <p>The full <code>jj</code> website includes the documentation for several <code>jj</code> versions
(<code>prerelease</code>, latest release, and the older releases). The top-level (<code>prerelease</code>, latest release, and the older releases). The top-level
URL <a href="https://martinvonz.github.io/jj">https://martinvonz.github.io/jj</a> redirects to URL <a href="https://jj-vcs.github.io/jj">https://jj-vcs.github.io/jj</a> redirects to
<a href="https://martinvonz.github.io/jj/latest">https://martinvonz.github.io/jj/latest</a>, which in turn redirects to <a href="https://jj-vcs.github.io/jj/latest">https://jj-vcs.github.io/jj/latest</a>, which in turn redirects to
the docs for the last stable version.</p> the docs for the last stable version.</p>
<p>The different versions of documentation are managed and deployed with <p>The different versions of documentation are managed and deployed with
<a href="https://github.com/jimporter/mike"><code>mike</code></a>, which can be run with <a href="https://github.com/jimporter/mike"><code>mike</code></a>, which can be run with
@ -2203,6 +2224,12 @@ you can submit a PR based on the <code>gh-pages</code> bookmark of
</ul> </ul>
<p>The <code>.rs</code> files generated from <code>.proto</code> files are included in the repository, <p>The <code>.rs</code> files generated from <code>.proto</code> files are included in the repository,
and there is a GitHub CI check that will complain if they do not match.</p> and there is a GitHub CI check that will complain if they do not match.</p>
<h2 id="logging">Logging<a class="headerlink" href="#logging" title="Permanent link">&para;</a></h2>
<p>You can print internal jj logs using <code>JJ_LOG</code>. It acts like the <code>RUST_LOG</code>
environment variable, frequent in Rust codebases, and accepts one or more
<a href="https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html#directives">directives</a>. You can also use the <code>--debug</code> global option that sets
<code>debug</code> log level for all targets by default. <code>JJ_LOG</code> is still respected when
using <code>--debug</code>.</p>
<h2 id="profiling">Profiling<a class="headerlink" href="#profiling" title="Permanent link">&para;</a></h2> <h2 id="profiling">Profiling<a class="headerlink" href="#profiling" title="Permanent link">&para;</a></h2>
<p>One easy-to-use sampling profiler <p>One easy-to-use sampling profiler
is <a href="https://github.com/mstange/samply">samply</a>. For example: is <a href="https://github.com/mstange/samply">samply</a>. For example:

2
latest/design/copy-tracking/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/design/copy-tracking/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/design/copy-tracking/">
<link rel="prev" href="../tracking-branches/"> <link rel="prev" href="../tracking-branches/">

2
latest/design/git-submodule-storage/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/design/git-submodule-storage/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/design/git-submodule-storage/">
<link rel="prev" href="../git-submodules/"> <link rel="prev" href="../git-submodules/">

2
latest/design/git-submodules/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/design/git-submodules/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/design/git-submodules/">
<link rel="prev" href="../../governance/temporary-voting/"> <link rel="prev" href="../../governance/temporary-voting/">

14
latest/design/run/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/design/run/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/design/run/">
<link rel="prev" href="../git-submodule-storage/"> <link rel="prev" href="../git-submodule-storage/">
@ -1769,7 +1769,7 @@ working directory.</li>
</ul> </ul>
<h2 id="context-and-scope">Context and Scope<a class="headerlink" href="#context-and-scope" title="Permanent link">&para;</a></h2> <h2 id="context-and-scope">Context and Scope<a class="headerlink" href="#context-and-scope" title="Permanent link">&para;</a></h2>
<p>The initial need for some kind of command runner integrated in the VCS, surfaced <p>The initial need for some kind of command runner integrated in the VCS, surfaced
in a <a href="https://github.com/martinvonz/jj/issues/405">github discussion</a>. In a <a href="https://discord.com/channels/968932220549103686/969829516539228222/1047958933161119795">discussion on discord</a> about in a <a href="https://github.com/jj-vcs/jj/issues/405">github discussion</a>. In a <a href="https://discord.com/channels/968932220549103686/969829516539228222/1047958933161119795">discussion on discord</a> about
the git-hook model, there was consensus about not repeating their mistakes.</p> the git-hook model, there was consensus about not repeating their mistakes.</p>
<p>For <code>jj run</code> there is prior art in Mercurial, git branchless and Google's <p>For <code>jj run</code> there is prior art in Mercurial, git branchless and Google's
internal Mercurial. Currently git-branchless <code>git test</code> and <code>hg fix</code> implement internal Mercurial. Currently git-branchless <code>git test</code> and <code>hg fix</code> implement
@ -1847,11 +1847,11 @@ they take up space. That is especially problematic in the case of cargo (the
<code>target/</code> directory often takes up tens of GBs). The same flag for cleaning up <code>target/</code> directory often takes up tens of GBs). The same flag for cleaning up
ignored files can be used to address that. We may want to also have a flag for ignored files can be used to address that. We may want to also have a flag for
cleaning up temporary working copies <em>after</em> running the command.</p> cleaning up temporary working copies <em>after</em> running the command.</p>
<p>An early version of the command will directly use <a href="https://github.com/martinvonz/jj/blob/af85f552b676d66ed0e9ae0d401cd0c4ffbbeb21/lib/src/working_copy.rs#L117">Treestate</a> to <p>An early version of the command will directly use <a href="https://github.com/jj-vcs/jj/blob/af85f552b676d66ed0e9ae0d401cd0c4ffbbeb21/lib/src/working_copy.rs#L117">Treestate</a> to
to manage the temporary working copies. That means that running <code>jj</code> inside the to manage the temporary working copies. That means that running <code>jj</code> inside the
temporary working copies will not work . We can later extend that to use a full temporary working copies will not work . We can later extend that to use a full
<a href="https://github.com/martinvonz/jj/blob/af85f552b676d66ed0e9ae0d401cd0c4ffbbeb21/lib/src/workspace.rs#L54">Workspace</a>. To prevent operations in the working copies from <a href="https://github.com/jj-vcs/jj/blob/af85f552b676d66ed0e9ae0d401cd0c4ffbbeb21/lib/src/workspace.rs#L54">Workspace</a>. To prevent operations in the working copies from
impacting the repo, we can use a separate <a href="https://github.com/martinvonz/jj/blob/main/lib/src/op_heads_store.rs">OpHeadsStore</a> for it.</p> impacting the repo, we can use a separate <a href="https://github.com/jj-vcs/jj/blob/main/lib/src/op_heads_store.rs">OpHeadsStore</a> for it.</p>
<h3 id="modifying-the-working-copy">Modifying the Working Copy<a class="headerlink" href="#modifying-the-working-copy" title="Permanent link">&para;</a></h3> <h3 id="modifying-the-working-copy">Modifying the Working Copy<a class="headerlink" href="#modifying-the-working-copy" title="Permanent link">&para;</a></h3>
<p>Since the subprocesses will run in temporary working copies, they <p>Since the subprocesses will run in temporary working copies, they
won't interfere with the user's working copy. The user can therefore continue won't interfere with the user's working copy. The user can therefore continue
@ -1867,7 +1867,7 @@ want to have an option to ignore any changes made in the subprocess's working
copy.</p> copy.</p>
<h3 id="modifying-the-repo">Modifying the Repo<a class="headerlink" href="#modifying-the-repo" title="Permanent link">&para;</a></h3> <h3 id="modifying-the-repo">Modifying the Repo<a class="headerlink" href="#modifying-the-repo" title="Permanent link">&para;</a></h3>
<p>Once we give the subprocess access to a fork of the repo via separate <p>Once we give the subprocess access to a fork of the repo via separate
<a href="https://github.com/martinvonz/jj/blob/main/lib/src/op_heads_store.rs">OpHeadsStore</a>, it will be able to create new operations in its fork. <a href="https://github.com/jj-vcs/jj/blob/main/lib/src/op_heads_store.rs">OpHeadsStore</a>, it will be able to create new operations in its fork.
If the user runs <code>jj run -r foo</code> and the subprocess checks out another commit, If the user runs <code>jj run -r foo</code> and the subprocess checks out another commit,
it's not clear what that should do. We should probably just verify that the it's not clear what that should do. We should probably just verify that the
working-copy commit's parents are unchanged after the subprocess returns. Any working-copy commit's parents are unchanged after the subprocess returns. Any
@ -1946,7 +1946,7 @@ command)</li>
<code>jj diff</code>: No special handling needed <code>jj diff</code>: No special handling needed
<code>jj st</code>: For now reprint the final output of <code>jj run</code> <code>jj st</code>: For now reprint the final output of <code>jj run</code>
<code>jj op log</code>: No special handling needed, but awaits further discussion in <code>jj op log</code>: No special handling needed, but awaits further discussion in
<a href="https://github.com/martinvonz/jj/issues/963">#963</a> <a href="https://github.com/jj-vcs/jj/issues/963">#963</a>
<code>jj undo/jj op undo</code>: No special handling needed</p> <code>jj undo/jj op undo</code>: No special handling needed</p>
<h2 id="open-points">Open Points<a class="headerlink" href="#open-points" title="Permanent link">&para;</a></h2> <h2 id="open-points">Open Points<a class="headerlink" href="#open-points" title="Permanent link">&para;</a></h2>
<p>Should the command be working copy backend specific? <p>Should the command be working copy backend specific?

11
latest/design/sparse-v2/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/design/sparse-v2/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/design/sparse-v2/">
<link rel="prev" href="../run/"> <link rel="prev" href="../run/">
@ -1671,8 +1671,8 @@ end state.</p>
and custom implementations. This includes three main goals:</p> and custom implementations. This includes three main goals:</p>
<ol> <ol>
<li>Sparse Patterns should be versioned with the working copy</li> <li>Sparse Patterns should be versioned with the working copy</li>
<li>Sparse Patterns should support more <a href="https://github.com/martinvonz/jj/issues/1896">flexible matching rules</a></li> <li>Sparse Patterns should support more <a href="https://github.com/jj-vcs/jj/issues/1896">flexible matching rules</a></li>
<li>Sparse Patterns should support <a href="https://github.com/martinvonz/jj/issues/2288">client path remapping</a></li> <li>Sparse Patterns should support <a href="https://github.com/jj-vcs/jj/issues/2288">client path remapping</a></li>
</ol> </ol>
<h2 id="current-state-as-of-jj-0130">Current State (as of jj 0.13.0)<a class="headerlink" href="#current-state-as-of-jj-0130" title="Permanent link">&para;</a></h2> <h2 id="current-state-as-of-jj-0130">Current State (as of jj 0.13.0)<a class="headerlink" href="#current-state-as-of-jj-0130" title="Permanent link">&para;</a></h2>
<p>Sparse patterns are an effectively unordered list of prefix strings:</p> <p>Sparse patterns are an effectively unordered list of prefix strings:</p>
@ -1810,7 +1810,10 @@ form of a <code>WorkingCopyPatterns</code> is defined as the form such that:</p>
</li> </li>
</ul> </ul>
<h3 id="working-copy-map">Working Copy Map<a class="headerlink" href="#working-copy-map" title="Permanent link">&para;</a></h3> <h3 id="working-copy-map">Working Copy Map<a class="headerlink" href="#working-copy-map" title="Permanent link">&para;</a></h3>
<p>WARNING: This section is intentionally lacking, more research is needed.</p> <div class="admonition warning">
<p class="admonition-title">Warning</p>
<p>This section is intentionally lacking, more research is needed.</p>
</div>
<p>All <code>WorkingCopyPatterns</code> will come equipped with a default no-op mapping. <p>All <code>WorkingCopyPatterns</code> will come equipped with a default no-op mapping.
These mappings are inspired by and similar to <a href="https://www.perforce.com/manuals/cmdref/Content/CmdRef/views.html">Perforce client views</a>.</p> These mappings are inspired by and similar to <a href="https://www.perforce.com/manuals/cmdref/Content/CmdRef/views.html">Perforce client views</a>.</p>
<div class="highlight"><pre><span></span><code><span class="fm">vec!</span><span class="p">[</span><span class="n">WorkingCopyMapping</span><span class="w"> </span><span class="p">{</span> <div class="highlight"><pre><span></span><code><span class="fm">vec!</span><span class="p">[</span><span class="n">WorkingCopyMapping</span><span class="w"> </span><span class="p">{</span>

16
latest/design/tracking-branches/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/design/tracking-branches/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/design/tracking-branches/">
<link rel="prev" href="../sparse-v2/"> <link rel="prev" href="../sparse-v2/">
@ -1766,7 +1766,7 @@
<p>This is a plan to implement more Git-like remote tracking branch UX.</p> <p>This is a plan to implement more Git-like remote tracking branch UX.</p>
<h2 id="objective">Objective<a class="headerlink" href="#objective" title="Permanent link">&para;</a></h2> <h2 id="objective">Objective<a class="headerlink" href="#objective" title="Permanent link">&para;</a></h2>
<p><code>jj</code> imports all remote branches to local branches by default. As described in <p><code>jj</code> imports all remote branches to local branches by default. As described in
<a href="https://github.com/martinvonz/jj/issues/1136">#1136</a>, this doesn't interact nicely with Git if we have multiple Git remotes <a href="https://github.com/jj-vcs/jj/issues/1136">#1136</a>, this doesn't interact nicely with Git if we have multiple Git remotes
with a number of branches. The <code>git.auto-local-bookmark</code> config can mitigate this with a number of branches. The <code>git.auto-local-bookmark</code> config can mitigate this
problem, but we'll get locally-deleted branches instead.</p> problem, but we'll get locally-deleted branches instead.</p>
<p>The goal of this plan is to implement</p> <p>The goal of this plan is to implement</p>
@ -2195,7 +2195,7 @@ rolled back for that ref.</p>
</ul> </ul>
<h2 id="remaining-issues">Remaining issues<a class="headerlink" href="#remaining-issues" title="Permanent link">&para;</a></h2> <h2 id="remaining-issues">Remaining issues<a class="headerlink" href="#remaining-issues" title="Permanent link">&para;</a></h2>
<ul> <ul>
<li>https://github.com/martinvonz/jj/issues/1278 pushing to tracked remote<ul> <li>https://github.com/jj-vcs/jj/issues/1278 pushing to tracked remote<ul>
<li>Option could be added to push to all <code>tracking</code> remotes?</li> <li>Option could be added to push to all <code>tracking</code> remotes?</li>
</ul> </ul>
</li> </li>
@ -2214,11 +2214,11 @@ rolled back for that ref.</p>
</ul> </ul>
<h2 id="references">References<a class="headerlink" href="#references" title="Permanent link">&para;</a></h2> <h2 id="references">References<a class="headerlink" href="#references" title="Permanent link">&para;</a></h2>
<ul> <ul>
<li>https://github.com/martinvonz/jj/issues/1136</li> <li>https://github.com/jj-vcs/jj/issues/1136</li>
<li>https://github.com/martinvonz/jj/issues/1666</li> <li>https://github.com/jj-vcs/jj/issues/1666</li>
<li>https://github.com/martinvonz/jj/issues/1690</li> <li>https://github.com/jj-vcs/jj/issues/1690</li>
<li>https://github.com/martinvonz/jj/issues/1734</li> <li>https://github.com/jj-vcs/jj/issues/1734</li>
<li>https://github.com/martinvonz/jj/pull/1739</li> <li>https://github.com/jj-vcs/jj/pull/1739</li>
</ul> </ul>

2
latest/design_doc_blueprint/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/design_doc_blueprint/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/design_doc_blueprint/">
<link rel="prev" href="../design_docs/"> <link rel="prev" href="../design_docs/">

2
latest/design_docs/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/design_docs/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/design_docs/">
<link rel="prev" href="../code-of-conduct/"> <link rel="prev" href="../code-of-conduct/">

2
latest/filesets/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/filesets/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/filesets/">
<link rel="prev" href="../config/"> <link rel="prev" href="../config/">

2
latest/git-comparison/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/git-comparison/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/git-comparison/">
<link rel="prev" href="../templates/"> <link rel="prev" href="../templates/">

27
latest/git-compatibility/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/git-compatibility/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/git-compatibility/">
<link rel="prev" href="../git-comparison/"> <link rel="prev" href="../git-comparison/">
@ -1557,7 +1557,7 @@ a comparison with Git, including how workflows are different, see the
you miss any particular configuration options.<ul> you miss any particular configuration options.<ul>
<li>The configuration of remotes (<code>[remote "&lt;name&gt;"]</code>). Only the names and URLs <li>The configuration of remotes (<code>[remote "&lt;name&gt;"]</code>). Only the names and URLs
are respected (refspecs are not respected, and are respected (refspecs are not respected, and
<a href="https://github.com/martinvonz/jj/issues/4889">only the last pushurl</a> is <a href="https://github.com/jj-vcs/jj/issues/4889">only the last pushurl</a> is
respected).</li> respected).</li>
<li><code>core.excludesFile</code></li> <li><code>core.excludesFile</code></li>
</ul> </ul>
@ -1570,13 +1570,16 @@ a comparison with Git, including how workflows are different, see the
and <a href="#branches">how they interoperate with Git</a>.</li> and <a href="#branches">how they interoperate with Git</a>.</li>
<li><strong>Tags: Partial.</strong> You can check out tagged commits by name (pointed to be <li><strong>Tags: Partial.</strong> You can check out tagged commits by name (pointed to be
either annotated or lightweight tags), but you cannot create new tags.</li> either annotated or lightweight tags), but you cannot create new tags.</li>
<li><strong>.gitignore: Yes.</strong> Ignores in <code>.gitignore</code> files are supported. So are <li><strong>.gitignore: Yes.</strong> Patterns in <code>.gitignore</code> files are supported. So are
ignores in <code>.git/info/exclude</code> or configured via Git's <code>core.excludesfile</code> ignores in <code>.git/info/exclude</code> or configured via Git's <code>core.excludesfile</code>
config. The <code>.gitignore</code> support uses a native implementation, so please config. Since working-copy files are snapshotted by every <code>jj</code> command, you
report a bug if you notice any difference compared to <code>git</code>.</li> might need to run <code>jj file untrack</code> to exclude newly ignored files from the
<li><strong>.gitattributes: No.</strong> There's <a href="https://github.com/martinvonz/jj/issues/53">#53</a> working-copy commit. It's recommended to set up the ignore patterns earlier.
The <code>.gitignore</code> support uses a native implementation, so please report a bug
if you notice any difference compared to <code>git</code>.</li>
<li><strong>.gitattributes: No.</strong> There's <a href="https://github.com/jj-vcs/jj/issues/53">#53</a>
about adding support for at least the <code>eol</code> attribute.</li> about adding support for at least the <code>eol</code> attribute.</li>
<li><strong>Hooks: No.</strong> There's <a href="https://github.com/martinvonz/jj/issues/405">#405</a> <li><strong>Hooks: No.</strong> There's <a href="https://github.com/jj-vcs/jj/issues/405">#405</a>
specifically for providing the checks from https://pre-commit.com.</li> specifically for providing the checks from https://pre-commit.com.</li>
<li><strong>Merge commits: Yes.</strong> Octopus merges (i.e. with more than 2 parents) are <li><strong>Merge commits: Yes.</strong> Octopus merges (i.e. with more than 2 parents) are
also supported.</li> also supported.</li>
@ -1586,11 +1589,11 @@ a comparison with Git, including how workflows are different, see the
parent of all commits Git would call "root commits".</li> parent of all commits Git would call "root commits".</li>
<li><strong>Staging area: Kind of.</strong> The staging area will be ignored. For example, <li><strong>Staging area: Kind of.</strong> The staging area will be ignored. For example,
<code>jj diff</code> will show a diff from the Git HEAD to the working copy. There are <code>jj diff</code> will show a diff from the Git HEAD to the working copy. There are
<a href="https://github.com/martinvonz/jj/blob/main/docs/git-comparison.md#the-index">ways of fulfilling your use cases without a staging <a href="https://github.com/jj-vcs/jj/blob/main/docs/git-comparison.md#the-index">ways of fulfilling your use cases without a staging
area</a>.</li> area</a>.</li>
<li><strong>Garbage collection: Yes.</strong> It should be safe to run <code>git gc</code> in the Git <li><strong>Garbage collection: Yes.</strong> It should be safe to run <code>git gc</code> in the Git
repo, but it's not tested, so it's probably a good idea to make a backup of repo, but it's not tested, so it's probably a good idea to make a backup of
the whole workspace first. There's <a href="https://github.com/martinvonz/jj/issues/12">no garbage collection and repacking of the whole workspace first. There's <a href="https://github.com/jj-vcs/jj/issues/12">no garbage collection and repacking of
Jujutsu's own data structures yet</a>, Jujutsu's own data structures yet</a>,
however.</li> however.</li>
<li><strong>Bare repositories: Yes.</strong> You can use <code>jj git init --git-repo=&lt;path&gt;</code> to <li><strong>Bare repositories: Yes.</strong> You can use <code>jj git init --git-repo=&lt;path&gt;</code> to
@ -1607,9 +1610,9 @@ a comparison with Git, including how workflows are different, see the
<li><strong>Sparse checkouts: No.</strong> However, there's native support for sparse <li><strong>Sparse checkouts: No.</strong> However, there's native support for sparse
checkouts. See the <code>jj sparse</code> command.</li> checkouts. See the <code>jj sparse</code> command.</li>
<li><strong>Signed commits: Partial.</strong> <li><strong>Signed commits: Partial.</strong>
So far only <a href="https://github.com/martinvonz/jj/blob/main/docs/config.md#commit-signing">by configuration</a>, So far only <a href="https://github.com/jj-vcs/jj/blob/main/docs/config.md#commit-signing">by configuration</a>,
later perhaps <a href="https://github.com/martinvonz/jj/pull/3142">a command</a>.</li> later perhaps <a href="https://github.com/jj-vcs/jj/pull/3142">a command</a>.</li>
<li><strong>Git LFS: No.</strong> (<a href="https://github.com/martinvonz/jj/issues/80">#80</a>)</li> <li><strong>Git LFS: No.</strong> (<a href="https://github.com/jj-vcs/jj/issues/80">#80</a>)</li>
</ul> </ul>
<h2 id="creating-an-empty-repo">Creating an empty repo<a class="headerlink" href="#creating-an-empty-repo" title="Permanent link">&para;</a></h2> <h2 id="creating-an-empty-repo">Creating an empty repo<a class="headerlink" href="#creating-an-empty-repo" title="Permanent link">&para;</a></h2>
<p>To create an empty repo using the Git backend, use <code>jj init --git &lt;name&gt;</code>. Since <p>To create an empty repo using the Git backend, use <code>jj init --git &lt;name&gt;</code>. Since

23
latest/github/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/github/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/github/">
<link rel="prev" href="../tutorial/"> <link rel="prev" href="../tutorial/">
@ -1683,7 +1683,7 @@
<h2 id="set-up-an-ssh-key">Set up an SSH key<a class="headerlink" href="#set-up-an-ssh-key" title="Permanent link">&para;</a></h2> <h2 id="set-up-an-ssh-key">Set up an SSH key<a class="headerlink" href="#set-up-an-ssh-key" title="Permanent link">&para;</a></h2>
<p>As of October 2023 it's recommended to set up an SSH key to work with GitHub <p>As of October 2023 it's recommended to set up an SSH key to work with GitHub
projects. See <a href="https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent">GitHub's Tutorial</a>. This restriction may be lifted in the projects. See <a href="https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent">GitHub's Tutorial</a>. This restriction may be lifted in the
future, see <a href="https://github.com/martinvonz/jj/issues/469">issue #469</a> for more information and progress on future, see <a href="https://github.com/jj-vcs/jj/issues/469">issue #469</a> for more information and progress on
authenticated HTTP.</p> authenticated HTTP.</p>
<h2 id="basic-workflow">Basic workflow<a class="headerlink" href="#basic-workflow" title="Permanent link">&para;</a></h2> <h2 id="basic-workflow">Basic workflow<a class="headerlink" href="#basic-workflow" title="Permanent link">&para;</a></h2>
<p>The simplest way to start with Jujutsu is to create a stack of commits first. <p>The simplest way to start with Jujutsu is to create a stack of commits first.
@ -1722,13 +1722,14 @@ Git-like manner, you will then need to move the bookmark manually when you creat
a new commits. Unlike Git, Jujutsu will not do it automatically.</p> a new commits. Unlike Git, Jujutsu will not do it automatically.</p>
<h2 id="updating-the-repository">Updating the repository<a class="headerlink" href="#updating-the-repository" title="Permanent link">&para;</a></h2> <h2 id="updating-the-repository">Updating the repository<a class="headerlink" href="#updating-the-repository" title="Permanent link">&para;</a></h2>
<p>As of October 2023, Jujutsu has no equivalent to a <code>git pull</code> command (see <p>As of October 2023, Jujutsu has no equivalent to a <code>git pull</code> command (see
<a href="https://github.com/martinvonz/jj/issues/1039">issue #1039</a>). Until such a command is added, you need to use <a href="https://github.com/jj-vcs/jj/issues/1039">issue #1039</a>). Until such a command is added, you need to use
<code>jj git fetch</code> followed by a <code>jj rebase -d $main_bookmark</code> to update your <code>jj git fetch</code> followed by a <code>jj rebase -d $main_bookmark</code> to update your
changes.</p> changes.</p>
<h2 id="working-in-a-git-co-located-repository">Working in a Git co-located repository<a class="headerlink" href="#working-in-a-git-co-located-repository" title="Permanent link">&para;</a></h2> <h2 id="working-in-a-git-co-located-repository">Working in a Git co-located repository<a class="headerlink" href="#working-in-a-git-co-located-repository" title="Permanent link">&para;</a></h2>
<p>After doing <code>jj git init --colocate</code>, Git will be in a <a href="https://git-scm.com/docs/git-checkout#_detached_head">detached HEAD <p>After doing <code>jj git init --colocate</code>, Git will be in a <a href="https://git-scm.com/docs/git-checkout#_detached_head">detached HEAD
state</a>, which is unusual, as Git mainly works with bookmarks. In a state</a>, which is unusual, as Git mainly works with named branches; jj
co-located repository, every <code>jj</code> command will automatically synchronize does not.</p>
<p>In a co-located repository, every <code>jj</code> command will automatically synchronize
Jujutsu's view of the repo with Git's view. For example, <code>jj commit</code> updates the Jujutsu's view of the repo with Git's view. For example, <code>jj commit</code> updates the
HEAD of the Git repository, enabling an incremental migration.</p> HEAD of the Git repository, enabling an incremental migration.</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>nvim<span class="w"> </span>docs/tutorial.md <div class="highlight"><pre><span></span><code>$<span class="w"> </span>nvim<span class="w"> </span>docs/tutorial.md
@ -1764,7 +1765,7 @@ $<span class="w"> </span>jj<span class="w"> </span>diff
$<span class="w"> </span><span class="c1"># Give the fix a description and create a new working-copy on top.</span> $<span class="w"> </span><span class="c1"># Give the fix a description and create a new working-copy on top.</span>
$<span class="w"> </span>jj<span class="w"> </span>commit<span class="w"> </span>-m<span class="w"> </span><span class="s1">&#39;address pr comments&#39;</span> $<span class="w"> </span>jj<span class="w"> </span>commit<span class="w"> </span>-m<span class="w"> </span><span class="s1">&#39;address pr comments&#39;</span>
$<span class="w"> </span><span class="c1"># Update the bookmark to point to the new commit.</span> $<span class="w"> </span><span class="c1"># Update the bookmark to point to the new commit.</span>
$<span class="w"> </span>jj<span class="w"> </span>bookmark<span class="w"> </span><span class="nb">set</span><span class="w"> </span>your-feature<span class="w"> </span>-r<span class="w"> </span>@- $<span class="w"> </span>jj<span class="w"> </span>bookmark<span class="w"> </span>move<span class="w"> </span>your-feature<span class="w"> </span>--to<span class="w"> </span>@-
$<span class="w"> </span><span class="c1"># Push it to your remote</span> $<span class="w"> </span><span class="c1"># Push it to your remote</span>
$<span class="w"> </span>jj<span class="w"> </span>git<span class="w"> </span>push $<span class="w"> </span>jj<span class="w"> </span>git<span class="w"> </span>push
</code></pre></div> </code></pre></div>
@ -1782,7 +1783,7 @@ $<span class="w"> </span>jj<span class="w"> </span>diff
$<span class="w"> </span><span class="c1"># Give the fix a description.</span> $<span class="w"> </span><span class="c1"># Give the fix a description.</span>
$<span class="w"> </span>jj<span class="w"> </span>describe<span class="w"> </span>-m<span class="w"> </span><span class="s1">&#39;address pr comments&#39;</span> $<span class="w"> </span>jj<span class="w"> </span>describe<span class="w"> </span>-m<span class="w"> </span><span class="s1">&#39;address pr comments&#39;</span>
$<span class="w"> </span><span class="c1"># Update the bookmark to point to the current commit.</span> $<span class="w"> </span><span class="c1"># Update the bookmark to point to the current commit.</span>
$<span class="w"> </span>jj<span class="w"> </span>bookmark<span class="w"> </span><span class="nb">set</span><span class="w"> </span>your-feature<span class="w"> </span>-r<span class="w"> </span>@ $<span class="w"> </span>jj<span class="w"> </span>bookmark<span class="w"> </span>move<span class="w"> </span>your-feature<span class="w"> </span>--to<span class="w"> </span>@
$<span class="w"> </span><span class="c1"># Push it to your remote</span> $<span class="w"> </span><span class="c1"># Push it to your remote</span>
$<span class="w"> </span>jj<span class="w"> </span>git<span class="w"> </span>push $<span class="w"> </span>jj<span class="w"> </span>git<span class="w"> </span>push
</code></pre></div> </code></pre></div>
@ -1801,7 +1802,7 @@ $<span class="w"> </span><span class="c1"># force push</span>
$<span class="w"> </span>jj<span class="w"> </span>git<span class="w"> </span>push<span class="w"> </span>--bookmark<span class="w"> </span>your-feature $<span class="w"> </span>jj<span class="w"> </span>git<span class="w"> </span>push<span class="w"> </span>--bookmark<span class="w"> </span>your-feature
</code></pre></div> </code></pre></div>
<p>The hyphen after <code>your-feature</code> comes from the <p>The hyphen after <code>your-feature</code> comes from the
<a href="https://github.com/martinvonz/jj/blob/main/docs/revsets.md">revset</a> syntax.</p> <a href="https://github.com/jj-vcs/jj/blob/main/docs/revsets.md">revset</a> syntax.</p>
<h2 id="working-with-other-peoples-bookmarks">Working with other people's bookmarks<a class="headerlink" href="#working-with-other-peoples-bookmarks" title="Permanent link">&para;</a></h2> <h2 id="working-with-other-peoples-bookmarks">Working with other people's bookmarks<a class="headerlink" href="#working-with-other-peoples-bookmarks" title="Permanent link">&para;</a></h2>
<p>By default, <code>jj git clone</code> imports the default remote bookmark (which is usually <p>By default, <code>jj git clone</code> imports the default remote bookmark (which is usually
<code>main</code> or <code>master</code>), but <code>jj git fetch</code> doesn't import new remote bookmarks to <code>main</code> or <code>master</code>), but <code>jj git fetch</code> doesn't import new remote bookmarks to
@ -1814,7 +1815,7 @@ contributor's bookmark as <code>jj new &lt;bookmark&gt;</code> instead of <code>
<h2 id="using-github-cli">Using GitHub CLI<a class="headerlink" href="#using-github-cli" title="Permanent link">&para;</a></h2> <h2 id="using-github-cli">Using GitHub CLI<a class="headerlink" href="#using-github-cli" title="Permanent link">&para;</a></h2>
<p>GitHub CLI will have trouble finding the proper Git repository path in jj repos <p>GitHub CLI will have trouble finding the proper Git repository path in jj repos
that aren't <a href="../git-compatibility/#co-located-jujutsugit-repos">co-located</a> that aren't <a href="../git-compatibility/#co-located-jujutsugit-repos">co-located</a>
(see <a href="https://github.com/martinvonz/jj/issues/1008">issue #1008</a>). You can configure the <code>$GIT_DIR</code> environment variable to (see <a href="https://github.com/jj-vcs/jj/issues/1008">issue #1008</a>). You can configure the <code>$GIT_DIR</code> environment variable to
point it to the right path:</p> point it to the right path:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span><span class="nv">GIT_DIR</span><span class="o">=</span>.jj/repo/store/git<span class="w"> </span>gh<span class="w"> </span>issue<span class="w"> </span>list <div class="highlight"><pre><span></span><code>$<span class="w"> </span><span class="nv">GIT_DIR</span><span class="o">=</span>.jj/repo/store/git<span class="w"> </span>gh<span class="w"> </span>issue<span class="w"> </span>list
</code></pre></div> </code></pre></div>
@ -1838,8 +1839,8 @@ remote:</p>
<p>Log all remote bookmarks that you authored or committed to:</p> <p>Log all remote bookmarks that you authored or committed to:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span>-r<span class="w"> </span><span class="s1">&#39;remote_bookmarks() &amp; (mine() | committer(your@email.com))&#39;</span> <div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span>-r<span class="w"> </span><span class="s1">&#39;remote_bookmarks() &amp; (mine() | committer(your@email.com))&#39;</span>
</code></pre></div> </code></pre></div>
<p>Log all descendants of the current working copy that aren't on any remote:</p> <p>Log all ancestors of the current working copy that aren't on any remote:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span>-r<span class="w"> </span><span class="s1">&#39;::@ &amp; ~remote_bookmarks()&#39;</span> <div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span>-r<span class="w"> </span><span class="s1">&#39;remote_bookmarks()..@&#39;</span>
</code></pre></div> </code></pre></div>
<h2 id="merge-conflicts">Merge conflicts<a class="headerlink" href="#merge-conflicts" title="Permanent link">&para;</a></h2> <h2 id="merge-conflicts">Merge conflicts<a class="headerlink" href="#merge-conflicts" title="Permanent link">&para;</a></h2>
<p>For a detailed overview, how Jujutsu handles conflicts, revisit <p>For a detailed overview, how Jujutsu handles conflicts, revisit

2
latest/glossary/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/glossary/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/glossary/">
<link rel="prev" href="../operation-log/"> <link rel="prev" href="../operation-log/">

2
latest/governance/temporary-voting/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/governance/temporary-voting/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/governance/temporary-voting/">
<link rel="prev" href="../../design_doc_blueprint/"> <link rel="prev" href="../../design_doc_blueprint/">

10
latest/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/">
@ -1427,13 +1427,13 @@ on the hamburger menu that appears in this situation.</p>
<code>jj</code> installed.</p> <code>jj</code> installed.</p>
<p>You may want to jump to:</p> <p>You may want to jump to:</p>
<ul> <ul>
<li>Documentation for the <a href="https://martinvonz.github.io/jj/latest">latest released version of <code>jj</code></a>.</li> <li>Documentation for the <a href="https://jj-vcs.github.io/jj/latest">latest released version of <code>jj</code></a>.</li>
<li>Documentation for the <a href="https://martinvonz.github.io/jj/prerelease">unreleased version of <code>jj</code></a>. This version of the docs corresponds to the <code>main</code> branch of the <code>jj</code> repo.</li> <li>Documentation for the <a href="https://jj-vcs.github.io/jj/prerelease">unreleased version of <code>jj</code></a>. This version of the docs corresponds to the <code>main</code> branch of the <code>jj</code> repo.</li>
</ul> </ul>
<h2 id="some-useful-links">Some useful links<a class="headerlink" href="#some-useful-links" title="Permanent link">&para;</a></h2> <h2 id="some-useful-links">Some useful links<a class="headerlink" href="#some-useful-links" title="Permanent link">&para;</a></h2>
<ul> <ul>
<li><a href="https://github.com/martinvonz/jj">GitHub repo for <code>jj</code></a></li> <li><a href="https://github.com/jj-vcs/jj">GitHub repo for <code>jj</code></a></li>
<li>Overview of <code>jj</code> in the repo's <a href="https://github.com/martinvonz/jj?tab=readme-ov-file#readme">README</a></li> <li>Overview of <code>jj</code> in the repo's <a href="https://github.com/jj-vcs/jj?tab=readme-ov-file#readme">README</a></li>
<li><a href="install-and-setup/">Installation and Setup</a></li> <li><a href="install-and-setup/">Installation and Setup</a></li>
<li><a href="tutorial/">Tutorial and Birds-Eye View</a></li> <li><a href="tutorial/">Tutorial and Birds-Eye View</a></li>
<li><a href="github/">Working with GitHub</a></li> <li><a href="github/">Working with GitHub</a></li>

14
latest/install-and-setup/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/install-and-setup/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/install-and-setup/">
<link rel="prev" href=".."> <link rel="prev" href="..">
@ -1843,7 +1843,7 @@
<h1 id="installation-and-setup">Installation and setup<a class="headerlink" href="#installation-and-setup" title="Permanent link">&para;</a></h1> <h1 id="installation-and-setup">Installation and setup<a class="headerlink" href="#installation-and-setup" title="Permanent link">&para;</a></h1>
<h2 id="installation">Installation<a class="headerlink" href="#installation" title="Permanent link">&para;</a></h2> <h2 id="installation">Installation<a class="headerlink" href="#installation" title="Permanent link">&para;</a></h2>
<h3 id="download-pre-built-binaries-for-a-release">Download pre-built binaries for a release<a class="headerlink" href="#download-pre-built-binaries-for-a-release" title="Permanent link">&para;</a></h3> <h3 id="download-pre-built-binaries-for-a-release">Download pre-built binaries for a release<a class="headerlink" href="#download-pre-built-binaries-for-a-release" title="Permanent link">&para;</a></h3>
<p>There are <a href="https://github.com/martinvonz/jj/releases/latest">pre-built binaries</a> <p>There are <a href="https://github.com/jj-vcs/jj/releases/latest">pre-built binaries</a>
of the last released version of <code>jj</code> for Windows, Mac, or Linux (the "musl" of the last released version of <code>jj</code> for Windows, Mac, or Linux (the "musl"
version should work on all distributions).</p> version should work on all distributions).</p>
<p>If you'd like to install a prerelease version, you'll need to use one of the <p>If you'd like to install a prerelease version, you'll need to use one of the
@ -1865,7 +1865,7 @@ something like this:</p>
</code></pre></div> </code></pre></div>
<p>Now run either:</p> <p>Now run either:</p>
<div class="highlight"><pre><span></span><code><span class="c1"># To install the *prerelease* version from the main branch</span> <div class="highlight"><pre><span></span><code><span class="c1"># To install the *prerelease* version from the main branch</span>
cargo<span class="w"> </span>install<span class="w"> </span>--git<span class="w"> </span>https://github.com/martinvonz/jj.git<span class="w"> </span>--locked<span class="w"> </span>--bin<span class="w"> </span>jj<span class="w"> </span>jj-cli cargo<span class="w"> </span>install<span class="w"> </span>--git<span class="w"> </span>https://github.com/jj-vcs/jj.git<span class="w"> </span>--locked<span class="w"> </span>--bin<span class="w"> </span>jj<span class="w"> </span>jj-cli
</code></pre></div> </code></pre></div>
<p>or:</p> <p>or:</p>
<div class="highlight"><pre><span></span><code><span class="c1"># To install the latest release</span> <div class="highlight"><pre><span></span><code><span class="c1"># To install the latest release</span>
@ -1908,7 +1908,7 @@ Details on how to enable the GURU repository can be found <a href="https://wiki.
</code></pre></div> </code></pre></div>
<p>Now run either:</p> <p>Now run either:</p>
<div class="highlight"><pre><span></span><code><span class="c1"># To install the *prerelease* version from the main branch</span> <div class="highlight"><pre><span></span><code><span class="c1"># To install the *prerelease* version from the main branch</span>
cargo<span class="w"> </span>install<span class="w"> </span>--git<span class="w"> </span>https://github.com/martinvonz/jj.git<span class="w"> </span><span class="se">\</span> cargo<span class="w"> </span>install<span class="w"> </span>--git<span class="w"> </span>https://github.com/jj-vcs/jj.git<span class="w"> </span><span class="se">\</span>
<span class="w"> </span>--features<span class="w"> </span>vendored-openssl<span class="w"> </span>--locked<span class="w"> </span>--bin<span class="w"> </span>jj<span class="w"> </span>jj-cli <span class="w"> </span>--features<span class="w"> </span>vendored-openssl<span class="w"> </span>--locked<span class="w"> </span>--bin<span class="w"> </span>jj<span class="w"> </span>jj-cli
</code></pre></div> </code></pre></div>
<p>or:</p> <p>or:</p>
@ -1926,7 +1926,7 @@ brew<span class="w"> </span>install<span class="w"> </span>pkg-config
</code></pre></div> </code></pre></div>
<p>Now run either:</p> <p>Now run either:</p>
<div class="highlight"><pre><span></span><code><span class="c1"># To install the *prerelease* version from the main branch</span> <div class="highlight"><pre><span></span><code><span class="c1"># To install the *prerelease* version from the main branch</span>
cargo<span class="w"> </span>install<span class="w"> </span>--git<span class="w"> </span>https://github.com/martinvonz/jj.git<span class="w"> </span>--locked<span class="w"> </span>--bin<span class="w"> </span>jj<span class="w"> </span>jj-cli cargo<span class="w"> </span>install<span class="w"> </span>--git<span class="w"> </span>https://github.com/jj-vcs/jj.git<span class="w"> </span>--locked<span class="w"> </span>--bin<span class="w"> </span>jj<span class="w"> </span>jj-cli
</code></pre></div> </code></pre></div>
<p>or:</p> <p>or:</p>
<div class="highlight"><pre><span></span><code><span class="c1"># To install the latest release</span> <div class="highlight"><pre><span></span><code><span class="c1"># To install the latest release</span>
@ -1946,7 +1946,7 @@ sudo<span class="w"> </span>port<span class="w"> </span>install<span class="w">
<h3 id="windows">Windows<a class="headerlink" href="#windows" title="Permanent link">&para;</a></h3> <h3 id="windows">Windows<a class="headerlink" href="#windows" title="Permanent link">&para;</a></h3>
<p>First make sure that you have a Rust version &gt;= 1.76. Now run either:</p> <p>First make sure that you have a Rust version &gt;= 1.76. Now run either:</p>
<div class="highlight"><pre><span></span><code><span class="c1"># To install the *prerelease* version from the main branch</span> <div class="highlight"><pre><span></span><code><span class="c1"># To install the *prerelease* version from the main branch</span>
cargo<span class="w"> </span>install<span class="w"> </span>--git<span class="w"> </span>https://github.com/martinvonz/jj.git<span class="w"> </span>--locked<span class="w"> </span>--bin<span class="w"> </span>jj<span class="w"> </span>jj-cli<span class="w"> </span>--features<span class="w"> </span>vendored-openssl cargo<span class="w"> </span>install<span class="w"> </span>--git<span class="w"> </span>https://github.com/jj-vcs/jj.git<span class="w"> </span>--locked<span class="w"> </span>--bin<span class="w"> </span>jj<span class="w"> </span>jj-cli<span class="w"> </span>--features<span class="w"> </span>vendored-openssl
</code></pre></div> </code></pre></div>
<p>or:</p> <p>or:</p>
<div class="highlight"><pre><span></span><code><span class="c1"># To install the latest release</span> <div class="highlight"><pre><span></span><code><span class="c1"># To install the latest release</span>
@ -1971,7 +1971,7 @@ them. Please let us know if you encounter any issues, so we can ensure a smooth
transition once we default to these new completions. Our initial experience transition once we default to these new completions. Our initial experience
is that these new completions work best with <code>fish</code>. If you have ideas about is that these new completions work best with <code>fish</code>. If you have ideas about
specific completions that could be added, please share them specific completions that could be added, please share them
<a href="https://github.com/martinvonz/jj/issues/4763">here</a>.</p> <a href="https://github.com/jj-vcs/jj/issues/4763">here</a>.</p>
<h3 id="bash">Bash<a class="headerlink" href="#bash" title="Permanent link">&para;</a></h3> <h3 id="bash">Bash<a class="headerlink" href="#bash" title="Permanent link">&para;</a></h3>
<div class="highlight"><pre><span></span><code><span class="nb">source</span><span class="w"> </span>&lt;<span class="o">(</span>jj<span class="w"> </span>util<span class="w"> </span>completion<span class="w"> </span>bash<span class="o">)</span> <div class="highlight"><pre><span></span><code><span class="nb">source</span><span class="w"> </span>&lt;<span class="o">(</span>jj<span class="w"> </span>util<span class="w"> </span>completion<span class="w"> </span>bash<span class="o">)</span>
</code></pre></div> </code></pre></div>

2
latest/operation-log/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/operation-log/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/operation-log/">
<link rel="prev" href="../conflicts/"> <link rel="prev" href="../conflicts/">

2
latest/related-work/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/related-work/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/related-work/">
<link rel="prev" href="../sapling-comparison/"> <link rel="prev" href="../sapling-comparison/">

8
latest/revsets/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/revsets/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/revsets/">
<link rel="prev" href="../filesets/"> <link rel="prev" href="../filesets/">
@ -2028,7 +2028,7 @@ function will be shadowed by name, and can't co-exist with aliases.</p>
<h3 id="built-in-aliases">Built-in Aliases<a class="headerlink" href="#built-in-aliases" title="Permanent link">&para;</a></h3> <h3 id="built-in-aliases">Built-in Aliases<a class="headerlink" href="#built-in-aliases" title="Permanent link">&para;</a></h3>
<p>The following aliases are built-in and used for certain operations. These functions <p>The following aliases are built-in and used for certain operations. These functions
are defined as aliases in order to allow you to overwrite them as needed. are defined as aliases in order to allow you to overwrite them as needed.
See <a href="https://github.com/martinvonz/jj/blob/main/cli/src/config/revsets.toml">revsets.toml</a> See <a href="https://github.com/jj-vcs/jj/blob/main/cli/src/config/revsets.toml">revsets.toml</a>
for a comprehensive list.</p> for a comprehensive list.</p>
<ul> <ul>
<li> <li>
@ -2048,8 +2048,8 @@ always resolves to exactly one commit. For example:</p>
<li> <li>
<p><code>builtin_immutable_heads()</code>: Resolves to <p><code>builtin_immutable_heads()</code>: Resolves to
<code>present(trunk()) | tags() | untracked_remote_bookmarks()</code>. It is used as the <code>present(trunk()) | tags() | untracked_remote_bookmarks()</code>. It is used as the
default definition for <code>immutable_heads()</code> below. it is not recommended to default definition for <code>immutable_heads()</code> below. It is not recommended to
redefined this alias. Prefer to redefine <code>immutable_heads()</code> instead.</p> redefine this alias. Prefer to redefine <code>immutable_heads()</code> instead.</p>
</li> </li>
<li> <li>
<p><code>immutable_heads()</code>: Resolves to <p><code>immutable_heads()</code>: Resolves to

6
latest/roadmap/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/roadmap/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/roadmap/">
<link rel="prev" href="../design/copy-tracking/"> <link rel="prev" href="../design/copy-tracking/">
@ -1543,7 +1543,7 @@ popular forges, we might include that support by default in the standard <code>j
binary.</p> binary.</p>
<h2 id="submodule-support">Submodule support<a class="headerlink" href="#submodule-support" title="Permanent link">&para;</a></h2> <h2 id="submodule-support">Submodule support<a class="headerlink" href="#submodule-support" title="Permanent link">&para;</a></h2>
<p>Git submodules are used frequently enough in large Git repos that we will <p>Git submodules are used frequently enough in large Git repos that we will
probably need to <a href="https://github.com/martinvonz/jj/issues/494">support them</a>. There are still big open probably need to <a href="https://github.com/jj-vcs/jj/issues/494">support them</a>. There are still big open
questions around UX.</p> questions around UX.</p>
<h2 id="better-rust-api-for-uis">Better Rust API for UIs<a class="headerlink" href="#better-rust-api-for-uis" title="Permanent link">&para;</a></h2> <h2 id="better-rust-api-for-uis">Better Rust API for UIs<a class="headerlink" href="#better-rust-api-for-uis" title="Permanent link">&para;</a></h2>
<p>UIs like <a href="https://github.com/gulbanana/gg">gg</a> currently have to duplicate quite a bit of logic from <code>jj-cli</code>. We <p>UIs like <a href="https://github.com/gulbanana/gg">gg</a> currently have to duplicate quite a bit of logic from <code>jj-cli</code>. We
@ -1580,7 +1580,7 @@ other commit as base, without needing to download any large files in the target
commit until the user asks for them via the file system. A VFS can also make it commit until the user asks for them via the file system. A VFS can also make it
cheap to snapshot the working copy by keeping track of all changes compared to cheap to snapshot the working copy by keeping track of all changes compared to
the base commit.</p> the base commit.</p>
<p>Having a VFS can also be very benefial for <a href="https://github.com/martinvonz/jj/issues/1869"><code>jj run</code></a>, since we can then <p>Having a VFS can also be very benefial for <a href="https://github.com/jj-vcs/jj/issues/1869"><code>jj run</code></a>, since we can then
cheaply create temporary working copies for the commands to run in.</p> cheaply create temporary working copies for the commands to run in.</p>
<h2 id="better-support-for-large-files">Better support for large files<a class="headerlink" href="#better-support-for-large-files" title="Permanent link">&para;</a></h2> <h2 id="better-support-for-large-files">Better support for large files<a class="headerlink" href="#better-support-for-large-files" title="Permanent link">&para;</a></h2>
<p>We have talked about somehow using content-defined chunking (CDC) to reduce <p>We have talked about somehow using content-defined chunking (CDC) to reduce

2
latest/sapling-comparison/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/sapling-comparison/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/sapling-comparison/">
<link rel="prev" href="../git-compatibility/"> <link rel="prev" href="../git-compatibility/">

2
latest/search/search_index.json
View File

File diff suppressed because one or more lines are too long

148
latest/sitemap.xml
View File

@ -1,151 +1,151 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/</loc> <loc>https://jj-vcs.github.io/jj/latest/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/FAQ/</loc> <loc>https://jj-vcs.github.io/jj/latest/FAQ/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/bookmarks/</loc> <loc>https://jj-vcs.github.io/jj/latest/bookmarks/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/cli-reference/</loc> <loc>https://jj-vcs.github.io/jj/latest/cli-reference/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/code-of-conduct/</loc> <loc>https://jj-vcs.github.io/jj/latest/code-of-conduct/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/community_tools/</loc> <loc>https://jj-vcs.github.io/jj/latest/community_tools/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/config/</loc> <loc>https://jj-vcs.github.io/jj/latest/config/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/conflicts/</loc> <loc>https://jj-vcs.github.io/jj/latest/conflicts/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/contributing/</loc> <loc>https://jj-vcs.github.io/jj/latest/contributing/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design_doc_blueprint/</loc> <loc>https://jj-vcs.github.io/jj/latest/design_doc_blueprint/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design_docs/</loc> <loc>https://jj-vcs.github.io/jj/latest/design_docs/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/filesets/</loc> <loc>https://jj-vcs.github.io/jj/latest/filesets/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/git-comparison/</loc> <loc>https://jj-vcs.github.io/jj/latest/git-comparison/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/git-compatibility/</loc> <loc>https://jj-vcs.github.io/jj/latest/git-compatibility/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/github/</loc> <loc>https://jj-vcs.github.io/jj/latest/github/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/glossary/</loc> <loc>https://jj-vcs.github.io/jj/latest/glossary/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/install-and-setup/</loc> <loc>https://jj-vcs.github.io/jj/latest/install-and-setup/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/operation-log/</loc> <loc>https://jj-vcs.github.io/jj/latest/operation-log/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/related-work/</loc> <loc>https://jj-vcs.github.io/jj/latest/related-work/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/revsets/</loc> <loc>https://jj-vcs.github.io/jj/latest/revsets/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/roadmap/</loc> <loc>https://jj-vcs.github.io/jj/latest/roadmap/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/sapling-comparison/</loc> <loc>https://jj-vcs.github.io/jj/latest/sapling-comparison/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/templates/</loc> <loc>https://jj-vcs.github.io/jj/latest/templates/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/testimonials/</loc> <loc>https://jj-vcs.github.io/jj/latest/testimonials/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/tutorial/</loc> <loc>https://jj-vcs.github.io/jj/latest/tutorial/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/windows/</loc> <loc>https://jj-vcs.github.io/jj/latest/windows/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/working-copy/</loc> <loc>https://jj-vcs.github.io/jj/latest/working-copy/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design/copy-tracking/</loc> <loc>https://jj-vcs.github.io/jj/latest/design/copy-tracking/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design/git-submodule-storage/</loc> <loc>https://jj-vcs.github.io/jj/latest/design/git-submodule-storage/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design/git-submodules/</loc> <loc>https://jj-vcs.github.io/jj/latest/design/git-submodules/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design/run/</loc> <loc>https://jj-vcs.github.io/jj/latest/design/run/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design/sparse-v2/</loc> <loc>https://jj-vcs.github.io/jj/latest/design/sparse-v2/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design/tracking-branches/</loc> <loc>https://jj-vcs.github.io/jj/latest/design/tracking-branches/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/governance/temporary-voting/</loc> <loc>https://jj-vcs.github.io/jj/latest/governance/temporary-voting/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/technical/architecture/</loc> <loc>https://jj-vcs.github.io/jj/latest/technical/architecture/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/technical/concurrency/</loc> <loc>https://jj-vcs.github.io/jj/latest/technical/concurrency/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/technical/conflicts/</loc> <loc>https://jj-vcs.github.io/jj/latest/technical/conflicts/</loc>
<lastmod>2024-12-04</lastmod> <lastmod>2025-01-02</lastmod>
</url> </url>
</urlset> </urlset>

BIN
latest/sitemap.xml.gz
View File

Binary file not shown.

2
latest/technical/architecture/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/technical/architecture/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/technical/architecture/">
<link rel="prev" href="../../related-work/"> <link rel="prev" href="../../related-work/">

4
latest/technical/concurrency/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/technical/concurrency/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/technical/concurrency/">
<link rel="prev" href="../architecture/"> <link rel="prev" href="../architecture/">
@ -1540,7 +1540,7 @@ bookmark was moved to two different locations, they will appear in <code>jj log<
both locations but with a "?" after the name, and <code>jj status</code> will also inform both locations but with a "?" after the name, and <code>jj status</code> will also inform
the user about the conflict.</p> the user about the conflict.</p>
<p>Note that, for now, there are known bugs in this area. Most notably, with the <p>Note that, for now, there are known bugs in this area. Most notably, with the
Git backend, <a href="https://github.com/martinvonz/jj/issues/2193">repository corruption is possible because the backend is not Git backend, <a href="https://github.com/jj-vcs/jj/issues/2193">repository corruption is possible because the backend is not
entirely lock-free</a>. If you know entirely lock-free</a>. If you know
about the bug, it is relatively easy to recover from.</p> about the bug, it is relatively easy to recover from.</p>
<p>Moreover, such use of Jujutsu is not currently thoroughly tested, <p>Moreover, such use of Jujutsu is not currently thoroughly tested,

4
latest/technical/conflicts/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/technical/conflicts/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/technical/conflicts/">
<link rel="prev" href="../concurrency/"> <link rel="prev" href="../concurrency/">
@ -1477,7 +1477,7 @@ stored when using the Git commit backend.</p>
<p>Remember that a 3-way merge can be written <code>A+C-B</code>. If one of those states is <p>Remember that a 3-way merge can be written <code>A+C-B</code>. If one of those states is
itself a conflict, then we simply insert the conflict expression there. Then we itself a conflict, then we simply insert the conflict expression there. Then we
simplify by removing canceling terms. These two steps are implemented in simplify by removing canceling terms. These two steps are implemented in
<code>Merge::flatten()</code> and <code>Merge::simplify()</code> in <a href="https://github.com/martinvonz/jj/blob/main/lib/src/merge.rs"><code>merge.rs</code></a>.</p> <code>Merge::flatten()</code> and <code>Merge::simplify()</code> in <a href="https://github.com/jj-vcs/jj/blob/main/lib/src/merge.rs"><code>merge.rs</code></a>.</p>
<p>For example, let's say commit B is based on A and is rebased to C, where it <p>For example, let's say commit B is based on A and is rebased to C, where it
results in conflicts (<code>B+C-A</code>), which the user leaves unresolved. If the commit results in conflicts (<code>B+C-A</code>), which the user leaves unresolved. If the commit
is then rebased to D, the result will be <code>(B+C-A)+(D-C)</code> (<code>D-C</code> comes from is then rebased to D, the result will be <code>(B+C-A)+(D-C)</code> (<code>D-C</code> comes from

35
latest/templates/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/templates/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/templates/">
<link rel="prev" href="../revsets/"> <link rel="prev" href="../revsets/">
@ -847,6 +847,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#email-type" class="md-nav__link">
<span class="md-ellipsis">
Email type
</span>
</a>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -1716,6 +1725,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#email-type" class="md-nav__link">
<span class="md-ellipsis">
Email type
</span>
</a>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -1929,8 +1947,10 @@ type</a> are available as keywords. For example,
<li><code>x.f()</code>: Method call.</li> <li><code>x.f()</code>: Method call.</li>
<li><code>-x</code>: Negate integer value.</li> <li><code>-x</code>: Negate integer value.</li>
<li><code>!x</code>: Logical not.</li> <li><code>!x</code>: Logical not.</li>
<li><code>x == y</code>, <code>x != y</code>: Logical equal/not equal. Operands must be either <li><code>x &gt;= y</code>, <code>x &gt; y</code>, <code>x &lt;= y</code>, <code>x &lt; y</code>: Greater than or equal/greater than/
<code>Boolean</code>, <code>Integer</code>, or <code>String</code>.</li> lesser than or equal/lesser than. Operands must be <code>Integer</code>s.</li>
<li><code>x == y</code>, <code>x != y</code>: Equal/not equal. Operands must be either <code>Boolean</code>,
<code>Integer</code>, or <code>String</code>.</li>
<li><code>x &amp;&amp; y</code>: Logical and, short-circuiting.</li> <li><code>x &amp;&amp; y</code>: Logical and, short-circuiting.</li>
<li><code>x || y</code>: Logical or, short-circuiting.</li> <li><code>x || y</code>: Logical or, short-circuiting.</li>
<li><code>x ++ y</code>: Concatenate <code>x</code> and <code>y</code> templates.</li> <li><code>x ++ y</code>: Concatenate <code>x</code> and <code>y</code> templates.</li>
@ -2018,6 +2038,12 @@ type</a> are available as keywords. For example,
<li><code>.short([len: Integer]) -&gt; String</code></li> <li><code>.short([len: Integer]) -&gt; String</code></li>
<li><code>.shortest([min_len: Integer]) -&gt; ShortestIdPrefix</code>: Shortest unique prefix.</li> <li><code>.shortest([min_len: Integer]) -&gt; ShortestIdPrefix</code>: Shortest unique prefix.</li>
</ul> </ul>
<h3 id="email-type">Email type<a class="headerlink" href="#email-type" title="Permanent link">&para;</a></h3>
<p>The following methods are defined.</p>
<ul>
<li><code>.local() -&gt; String</code></li>
<li><code>.domain() -&gt; String</code></li>
</ul>
<h3 id="integer-type">Integer type<a class="headerlink" href="#integer-type" title="Permanent link">&para;</a></h3> <h3 id="integer-type">Integer type<a class="headerlink" href="#integer-type" title="Permanent link">&para;</a></h3>
<p>No methods are defined.</p> <p>No methods are defined.</p>
<h3 id="list-type">List type<a class="headerlink" href="#list-type" title="Permanent link">&para;</a></h3> <h3 id="list-type">List type<a class="headerlink" href="#list-type" title="Permanent link">&para;</a></h3>
@ -2090,8 +2116,7 @@ invoked. If not set, an error will be reported inline on method call.</p>
<p>The following methods are defined.</p> <p>The following methods are defined.</p>
<ul> <ul>
<li><code>.name() -&gt; String</code></li> <li><code>.name() -&gt; String</code></li>
<li><code>.email() -&gt; String</code></li> <li><code>.email() -&gt; Email</code></li>
<li><code>.username() -&gt; String</code></li>
<li><code>.timestamp() -&gt; Timestamp</code></li> <li><code>.timestamp() -&gt; Timestamp</code></li>
</ul> </ul>
<h3 id="sizehint-type">SizeHint type<a class="headerlink" href="#sizehint-type" title="Permanent link">&para;</a></h3> <h3 id="sizehint-type">SizeHint type<a class="headerlink" href="#sizehint-type" title="Permanent link">&para;</a></h3>

2
latest/testimonials/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/testimonials/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/testimonials/">
<link rel="prev" href="../cli-reference/"> <link rel="prev" href="../cli-reference/">

2
latest/tutorial/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/tutorial/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/tutorial/">
<link rel="prev" href="../install-and-setup/"> <link rel="prev" href="../install-and-setup/">

2
latest/windows/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/windows/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/windows/">
<link rel="prev" href="../github/"> <link rel="prev" href="../github/">

8
latest/working-copy/index.html
View File

@ -8,7 +8,7 @@
<link rel="canonical" href="https://martinvonz.github.io/jj/latest/working-copy/"> <link rel="canonical" href="https://jj-vcs.github.io/jj/latest/working-copy/">
<link rel="prev" href="../community_tools/"> <link rel="prev" href="../community_tools/">
@ -1516,7 +1516,7 @@ resolutions.</p>
<p>With the <code>jj resolve</code> command, you can use an external merge tool to resolve <p>With the <code>jj resolve</code> command, you can use an external merge tool to resolve
conflicts that have 2 sides and a base. There is not yet a good way of conflicts that have 2 sides and a base. There is not yet a good way of
resolving conflicts between directories, files, and symlinks resolving conflicts between directories, files, and symlinks
(https://github.com/martinvonz/jj/issues/19). You can use <code>jj restore</code> to choose (https://github.com/jj-vcs/jj/issues/19). You can use <code>jj restore</code> to choose
one side of the conflict, but there's no way to even see where the involved one side of the conflict, but there's no way to even see where the involved
parts came from.</p> parts came from.</p>
<h2 id="ignored-files">Ignored files<a class="headerlink" href="#ignored-files" title="Permanent link">&para;</a></h2> <h2 id="ignored-files">Ignored files<a class="headerlink" href="#ignored-files" title="Permanent link">&para;</a></h2>
@ -1525,14 +1525,14 @@ control. You can tell Jujutsu to not automatically track certain files by using
<code>.gitignore</code> files (there's no such thing as <code>.jjignore</code> yet). <code>.gitignore</code> files (there's no such thing as <code>.jjignore</code> yet).
See https://git-scm.com/docs/gitignore for details about the format. See https://git-scm.com/docs/gitignore for details about the format.
<code>.gitignore</code> files are supported in any directory in the working copy, as well <code>.gitignore</code> files are supported in any directory in the working copy, as well
as in <code>$HOME/.gitignore</code> and <code>$GIT_DIR/info/exclude</code>.</p> as in <code>$XDG_CONFIG_DIR/git/ignore</code> and <code>$GIT_DIR/info/exclude</code>.</p>
<p>Ignored files are never tracked automatically (regardless of the value of <p>Ignored files are never tracked automatically (regardless of the value of
<code>snapshot.auto-track</code>), but they can still end up being tracked for a few reasons:</p> <code>snapshot.auto-track</code>), but they can still end up being tracked for a few reasons:</p>
<ul> <ul>
<li>if they were tracked in the parent commit</li> <li>if they were tracked in the parent commit</li>
<li>because of an explicit <code>jj file track</code> command</li> <li>because of an explicit <code>jj file track</code> command</li>
</ul> </ul>
<p>You can untrack such files with the jj file untrack command.</p> <p>You can untrack such files with the <code>jj file untrack</code> command.</p>
<h2 id="workspaces">Workspaces<a class="headerlink" href="#workspaces" title="Permanent link">&para;</a></h2> <h2 id="workspaces">Workspaces<a class="headerlink" href="#workspaces" title="Permanent link">&para;</a></h2>
<p>You can have multiple working copies backed by a single repo. Use <p>You can have multiple working copies backed by a single repo. Use
<code>jj workspace add</code> to create a new working copy. The working copy will have a <code>jj workspace add</code> to create a new working copy. The working copy will have a

1363
v0.25.0/404.html Normal file
View File

File diff suppressed because it is too large Load Diff

2060
v0.25.0/FAQ/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
v0.25.0/assets/images/favicon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

16
v0.25.0/assets/javascripts/bundle.525ec568.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

7
v0.25.0/assets/javascripts/bundle.525ec568.min.js.map Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.25.0/assets/javascripts/lunr/min/lunr.ar.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.25.0/assets/javascripts/lunr/min/lunr.da.min.js vendored Normal file
View File

@ -0,0 +1,18 @@
/*!
* Lunr languages, `Danish` language
* https://github.com/MihaiValentin/lunr-languages
*
* Copyright 2014, Mihai Valentin
* http://www.mozilla.org/MPL/
*/
/*!
* based on
* Snowball JavaScript Library v0.3
* http://code.google.com/p/urim/
* http://snowball.tartarus.org/
*
* Copyright 2010, Oleg Mazko
* http://www.mozilla.org/MPL/
*/
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.da=function(){this.pipeline.reset(),this.pipeline.add(e.da.trimmer,e.da.stopWordFilter,e.da.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.da.stemmer))},e.da.wordCharacters="A-Za-zªºÀ-ÖØ-öø-ʸˠ-ˤᴀ-ᴥᴬ-ᵜᵢ-ᵥᵫ-ᵷᵹ-ᶾḀ-ỿⁱⁿₐ-ₜKÅℲⅎⅠ-ↈⱠ-ⱿꜢ-ꞇꞋ-ꞭꞰ-ꞷꟷ-ꟿꬰ-ꭚꭜ-ꭤff-stＡ-Ｚａ-ｚ",e.da.trimmer=e.trimmerSupport.generateTrimmer(e.da.wordCharacters),e.Pipeline.registerFunction(e.da.trimmer,"trimmer-da"),e.da.stemmer=function(){var r=e.stemmerSupport.Among,i=e.stemmerSupport.SnowballProgram,n=new function(){function e(){var e,r=f.cursor+3;if(d=f.limit,0<=r&&r<=f.limit){for(a=r;;){if(e=f.cursor,f.in_grouping(w,97,248)){f.cursor=e;break}if(f.cursor=e,e>=f.limit)return;f.cursor++}for(;!f.out_grouping(w,97,248);){if(f.cursor>=f.limit)return;f.cursor++}d=f.cursor,d<a&&(d=a)}}function n(){var e,r;if(f.cursor>=d&&(r=f.limit_backward,f.limit_backward=d,f.ket=f.cursor,e=f.find_among_b(c,32),f.limit_backward=r,e))switch(f.bra=f.cursor,e){case 1:f.slice_del();break;case 2:f.in_grouping_b(p,97,229)&&f.slice_del()}}function t(){var e,r=f.limit-f.cursor;f.cursor>=d&&(e=f.limit_backward,f.limit_backward=d,f.ket=f.cursor,f.find_among_b(l,4)?(f.bra=f.cursor,f.limit_backward=e,f.cursor=f.limit-r,f.cursor>f.limit_backward&&(f.cursor--,f.bra=f.cursor,f.slice_del())):f.limit_backward=e)}function s(){var e,r,i,n=f.limit-f.cursor;if(f.ket=f.cursor,f.eq_s_b(2,"st")&&(f.bra=f.cursor,f.eq_s_b(2,"ig")&&f.slice_del()),f.cursor=f.limit-n,f.cursor>=d&&(r=f.limit_backward,f.limit_backward=d,f.ket=f.cursor,e=f.find_among_b(m,5),f.limit_backward=r,e))switch(f.bra=f.cursor,e){case 1:f.slice_del(),i=f.limit-f.cursor,t(),f.cursor=f.limit-i;break;case 2:f.slice_from("løs")}}function o(){var e;f.cursor>=d&&(e=f.limit_backward,f.limit_backward=d,f.ket=f.cursor,f.out_grouping_b(w,97,248)?(f.bra=f.cursor,u=f.slice_to(u),f.limit_backward=e,f.eq_v_b(u)&&f.slice_del()):f.limit_backward=e)}var a,d,u,c=[new r("hed",-1,1),new r("ethed",0,1),new r("ered",-1,1),new r("e",-1,1),new r("erede",3,1),new r("ende",3,1),new r("erende",5,1),new r("ene",3,1),new r("erne",3,1),new r("ere",3,1),new r("en",-1,1),new r("heden",10,1),new r("eren",10,1),new r("er",-1,1),new r("heder",13,1),new r("erer",13,1),new r("s",-1,2),new r("heds",16,1),new r("es",16,1),new r("endes",18,1),new r("erendes",19,1),new r("enes",18,1),new r("ernes",18,1),new r("eres",18,1),new r("ens",16,1),new r("hedens",24,1),new r("erens",24,1),new r("ers",16,1),new r("ets",16,1),new r("erets",28,1),new r("et",-1,1),new r("eret",30,1)],l=[new r("gd",-1,-1),new r("dt",-1,-1),new r("gt",-1,-1),new r("kt",-1,-1)],m=[new r("ig",-1,1),new r("lig",0,1),new r("elig",1,1),new r("els",-1,1),new r("løst",-1,2)],w=[17,65,16,1,0,0,0,0,0,0,0,0,0,0,0,0,48,0,128],p=[239,254,42,3,0,0,0,0,0,0,0,0,0,0,0,0,16],f=new i;this.setCurrent=function(e){f.setCurrent(e)},this.getCurrent=function(){return f.getCurrent()},this.stem=function(){var r=f.cursor;return e(),f.limit_backward=r,f.cursor=f.limit,n(),f.cursor=f.limit,t(),f.cursor=f.limit,s(),f.cursor=f.limit,o(),!0}};return function(e){return"function"==typeof e.update?e.update(function(e){return n.setCurrent(e),n.stem(),n.getCurrent()}):(n.setCurrent(e),n.stem(),n.getCurrent())}}(),e.Pipeline.registerFunction(e.da.stemmer,"stemmer-da"),e.da.stopWordFilter=e.generateStopWordFilter("ad af alle alt anden at blev blive bliver da de dem den denne der deres det dette dig din disse dog du efter eller en end er et for fra ham han hans har havde have hende hendes her hos hun hvad hvis hvor i ikke ind jeg jer jo kunne man mange med meget men mig min mine mit mod ned noget nogle nu når og også om op os over på selv sig sin sine sit skal skulle som sådan thi til ud under var vi vil ville vor være været".split(" ")),e.Pipeline.registerFunction(e.da.stopWordFilter,"stopWordFilter-da")}});

18
v0.25.0/assets/javascripts/lunr/min/lunr.de.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.25.0/assets/javascripts/lunr/min/lunr.du.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.25.0/assets/javascripts/lunr/min/lunr.el.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.25.0/assets/javascripts/lunr/min/lunr.es.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.25.0/assets/javascripts/lunr/min/lunr.fi.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.25.0/assets/javascripts/lunr/min/lunr.fr.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.25.0/assets/javascripts/lunr/min/lunr.he.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.25.0/assets/javascripts/lunr/min/lunr.hi.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.hi=function(){this.pipeline.reset(),this.pipeline.add(e.hi.trimmer,e.hi.stopWordFilter,e.hi.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.hi.stemmer))},e.hi.wordCharacters="ऀ-ःऄ-एऐ-टठ-यर-िी-ॏॐ-य़ॠ-९॰-ॿa-zA-Zａ-ｚＡ-Ｚ0-9０-９",e.hi.trimmer=e.trimmerSupport.generateTrimmer(e.hi.wordCharacters),e.Pipeline.registerFunction(e.hi.trimmer,"trimmer-hi"),e.hi.stopWordFilter=e.generateStopWordFilter("अत अपना अपनी अपने अभी अंदर आदि आप इत्यादि इन इनका इन्हीं इन्हें इन्हों इस इसका इसकी इसके इसमें इसी इसे उन उनका उनकी उनके उनको उन्हीं उन्हें उन्हों उस उसके उसी उसे एक एवं एस ऐसे और कई कर करता करते करना करने करें कहते कहा का काफ़ी कि कितना किन्हें किन्हों किया किर किस किसी किसे की कुछ कुल के को कोई कौन कौनसा गया घर जब जहाँ जा जितना जिन जिन्हें जिन्हों जिस जिसे जीधर जैसा जैसे जो तक तब तरह तिन तिन्हें तिन्हों तिस तिसे तो था थी थे दबारा दिया दुसरा दूसरे दो द्वारा न नके नहीं ना निहायत नीचे ने पर पहले पूरा पे फिर बनी बही बहुत बाद बाला बिलकुल भी भीतर मगर मानो मे में यदि यह यहाँ यही या यिह ये रखें रहा रहे ऱ्वासा लिए लिये लेकिन व वग़ैरह वर्ग वह वहाँ वहीं वाले वुह वे वो सकता सकते सबसे सभी साथ साबुत साभ सारा से सो संग ही हुआ हुई हुए है हैं हो होता होती होते होना होने".split(" ")),e.hi.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var r=e.wordcut;r.init(),e.hi.tokenizer=function(i){if(!arguments.length||null==i||void 0==i)return[];if(Array.isArray(i))return i.map(function(r){return isLunr2?new e.Token(r.toLowerCase()):r.toLowerCase()});var t=i.toString().toLowerCase().replace(/^\s+/,"");return r.cut(t).split("|")},e.Pipeline.registerFunction(e.hi.stemmer,"stemmer-hi"),e.Pipeline.registerFunction(e.hi.stopWordFilter,"stopWordFilter-hi")}});

18
v0.25.0/assets/javascripts/lunr/min/lunr.hu.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.25.0/assets/javascripts/lunr/min/lunr.hy.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.hy=function(){this.pipeline.reset(),this.pipeline.add(e.hy.trimmer,e.hy.stopWordFilter)},e.hy.wordCharacters="[A-Za-z԰-֏ff-ﭏ]",e.hy.trimmer=e.trimmerSupport.generateTrimmer(e.hy.wordCharacters),e.Pipeline.registerFunction(e.hy.trimmer,"trimmer-hy"),e.hy.stopWordFilter=e.generateStopWordFilter("դու և եք էիր էիք հետո նաև նրանք որը վրա է որ պիտի են այս մեջ ն իր ու ի այդ որոնք այն կամ էր մի ես համար այլ իսկ էին ենք հետ ին թ էինք մենք նրա նա դուք եմ էի ըստ որպես ում".split(" ")),e.Pipeline.registerFunction(e.hy.stopWordFilter,"stopWordFilter-hy"),e.hy.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}(),e.Pipeline.registerFunction(e.hy.stemmer,"stemmer-hy")}});

18
v0.25.0/assets/javascripts/lunr/min/lunr.it.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.25.0/assets/javascripts/lunr/min/lunr.ja.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");var r="2"==e.version[0];e.ja=function(){this.pipeline.reset(),this.pipeline.add(e.ja.trimmer,e.ja.stopWordFilter,e.ja.stemmer),r?this.tokenizer=e.ja.tokenizer:(e.tokenizer&&(e.tokenizer=e.ja.tokenizer),this.tokenizerFn&&(this.tokenizerFn=e.ja.tokenizer))};var t=new e.TinySegmenter;e.ja.tokenizer=function(i){var n,o,s,p,a,u,m,l,c,f;if(!arguments.length||null==i||void 0==i)return[];if(Array.isArray(i))return i.map(function(t){return r?new e.Token(t.toLowerCase()):t.toLowerCase()});for(o=i.toString().toLowerCase().replace(/^\s+/,""),n=o.length-1;n>=0;n--)if(/\S/.test(o.charAt(n))){o=o.substring(0,n+1);break}for(a=[],s=o.length,c=0,l=0;c<=s;c++)if(u=o.charAt(c),m=c-l,u.match(/\s/)||c==s){if(m>0)for(p=t.segment(o.slice(l,c)).filter(function(e){return!!e}),f=l,n=0;n<p.length;n++)r?a.push(new e.Token(p[n],{position:[f,p[n].length],index:a.length})):a.push(p[n]),f+=p[n].length;l=c+1}return a},e.ja.stemmer=function(){return function(e){return e}}(),e.Pipeline.registerFunction(e.ja.stemmer,"stemmer-ja"),e.ja.wordCharacters="一二三四五六七八九十百千万億兆一-龠々〆ヵヶぁ-んァ-ヴーｱ-ﾝﾞa-zA-Zａ-ｚＡ-Ｚ0-9０-９",e.ja.trimmer=e.trimmerSupport.generateTrimmer(e.ja.wordCharacters),e.Pipeline.registerFunction(e.ja.trimmer,"trimmer-ja"),e.ja.stopWordFilter=e.generateStopWordFilter("これ それ あれ この その あの ここ そこ あそこ こちら どこ だれ なに なん 何 私 貴方 貴方方 我々 私達 あの人 あのかた 彼女 彼 です あります おります います は が の に を で え から まで より も どの と し それで しかし".split(" ")),e.Pipeline.registerFunction(e.ja.stopWordFilter,"stopWordFilter-ja"),e.jp=e.ja,e.Pipeline.registerFunction(e.jp.stemmer,"stemmer-jp"),e.Pipeline.registerFunction(e.jp.trimmer,"trimmer-jp"),e.Pipeline.registerFunction(e.jp.stopWordFilter,"stopWordFilter-jp")}});

1
v0.25.0/assets/javascripts/lunr/min/lunr.jp.min.js vendored Normal file
View File

@ -0,0 +1 @@
module.exports=require("./lunr.ja");

1
v0.25.0/assets/javascripts/lunr/min/lunr.kn.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.kn=function(){this.pipeline.reset(),this.pipeline.add(e.kn.trimmer,e.kn.stopWordFilter,e.kn.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.kn.stemmer))},e.kn.wordCharacters="ಀ-಄ಅ-ಔಕ-ಹಾ-ೌ಼-ಽೕ-ೖೝ-ೞೠ-ೡೢ-ೣ೤೥೦-೯ೱ-ೳ",e.kn.trimmer=e.trimmerSupport.generateTrimmer(e.kn.wordCharacters),e.Pipeline.registerFunction(e.kn.trimmer,"trimmer-kn"),e.kn.stopWordFilter=e.generateStopWordFilter("ಮತ್ತು ಈ ಒಂದು ರಲ್ಲಿ ಹಾಗೂ ಎಂದು ಅಥವಾ ಇದು ರ ಅವರು ಎಂಬ ಮೇಲೆ ಅವರ ತನ್ನ ಆದರೆ ತಮ್ಮ ನಂತರ ಮೂಲಕ ಹೆಚ್ಚು ನ ಆ ಕೆಲವು ಅನೇಕ ಎರಡು ಹಾಗು ಪ್ರಮುಖ ಇದನ್ನು ಇದರ ಸುಮಾರು ಅದರ ಅದು ಮೊದಲ ಬಗ್ಗೆ ನಲ್ಲಿ ರಂದು ಇತರ ಅತ್ಯಂತ ಹೆಚ್ಚಿನ ಸಹ ಸಾಮಾನ್ಯವಾಗಿ ನೇ ಹಲವಾರು ಹೊಸ ದಿ ಕಡಿಮೆ ಯಾವುದೇ ಹೊಂದಿದೆ ದೊಡ್ಡ ಅನ್ನು ಇವರು ಪ್ರಕಾರ ಇದೆ ಮಾತ್ರ ಕೂಡ ಇಲ್ಲಿ ಎಲ್ಲಾ ವಿವಿಧ ಅದನ್ನು ಹಲವು ರಿಂದ ಕೇವಲ ದ ದಕ್ಷಿಣ ಗೆ ಅವನ ಅತಿ ನೆಯ ಬಹಳ ಕೆಲಸ ಎಲ್ಲ ಪ್ರತಿ ಇತ್ಯಾದಿ ಇವು ಬೇರೆ ಹೀಗೆ ನಡುವೆ ಇದಕ್ಕೆ ಎಸ್ ಇವರ ಮೊದಲು ಶ್ರೀ ಮಾಡುವ ಇದರಲ್ಲಿ ರೀತಿಯ ಮಾಡಿದ ಕಾಲ ಅಲ್ಲಿ ಮಾಡಲು ಅದೇ ಈಗ ಅವು ಗಳು ಎ ಎಂಬುದು ಅವನು ಅಂದರೆ ಅವರಿಗೆ ಇರುವ ವಿಶೇಷ ಮುಂದೆ ಅವುಗಳ ಮುಂತಾದ ಮೂಲ ಬಿ ಮೀ ಒಂದೇ ಇನ್ನೂ ಹೆಚ್ಚಾಗಿ ಮಾಡಿ ಅವರನ್ನು ಇದೇ ಯ ರೀತಿಯಲ್ಲಿ ಜೊತೆ ಅದರಲ್ಲಿ ಮಾಡಿದರು ನಡೆದ ಆಗ ಮತ್ತೆ ಪೂರ್ವ ಆತ ಬಂದ ಯಾವ ಒಟ್ಟು ಇತರೆ ಹಿಂದೆ ಪ್ರಮಾಣದ ಗಳನ್ನು ಕುರಿತು ಯು ಆದ್ದರಿಂದ ಅಲ್ಲದೆ ನಗರದ ಮೇಲಿನ ಏಕೆಂದರೆ ರಷ್ಟು ಎಂಬುದನ್ನು ಬಾರಿ ಎಂದರೆ ಹಿಂದಿನ ಆದರೂ ಆದ ಸಂಬಂಧಿಸಿದ ಮತ್ತೊಂದು ಸಿ ಆತನ ".split(" ")),e.kn.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var r=e.wordcut;r.init(),e.kn.tokenizer=function(t){if(!arguments.length||null==t||void 0==t)return[];if(Array.isArray(t))return t.map(function(r){return isLunr2?new e.Token(r.toLowerCase()):r.toLowerCase()});var n=t.toString().toLowerCase().replace(/^\s+/,"");return r.cut(n).split("|")},e.Pipeline.registerFunction(e.kn.stemmer,"stemmer-kn"),e.Pipeline.registerFunction(e.kn.stopWordFilter,"stopWordFilter-kn")}});

1
v0.25.0/assets/javascripts/lunr/min/lunr.ko.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.25.0/assets/javascripts/lunr/min/lunr.multi.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,t){"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():t()(e.lunr)}(this,function(){return function(e){e.multiLanguage=function(){for(var t=Array.prototype.slice.call(arguments),i=t.join("-"),r="",n=[],s=[],p=0;p<t.length;++p)"en"==t[p]?(r+="\\w",n.unshift(e.stopWordFilter),n.push(e.stemmer),s.push(e.stemmer)):(r+=e[t[p]].wordCharacters,e[t[p]].stopWordFilter&&n.unshift(e[t[p]].stopWordFilter),e[t[p]].stemmer&&(n.push(e[t[p]].stemmer),s.push(e[t[p]].stemmer)));var o=e.trimmerSupport.generateTrimmer(r);return e.Pipeline.registerFunction(o,"lunr-multi-trimmer-"+i),n.unshift(o),function(){this.pipeline.reset(),this.pipeline.add.apply(this.pipeline,n),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add.apply(this.searchPipeline,s))}}}});

18
v0.25.0/assets/javascripts/lunr/min/lunr.nl.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.25.0/assets/javascripts/lunr/min/lunr.no.min.js vendored Normal file
View File

@ -0,0 +1,18 @@
/*!
* Lunr languages, `Norwegian` language
* https://github.com/MihaiValentin/lunr-languages
*
* Copyright 2014, Mihai Valentin
* http://www.mozilla.org/MPL/
*/
/*!
* based on
* Snowball JavaScript Library v0.3
* http://code.google.com/p/urim/
* http://snowball.tartarus.org/
*
* Copyright 2010, Oleg Mazko
* http://www.mozilla.org/MPL/
*/
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.no=function(){this.pipeline.reset(),this.pipeline.add(e.no.trimmer,e.no.stopWordFilter,e.no.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.no.stemmer))},e.no.wordCharacters="A-Za-zªºÀ-ÖØ-öø-ʸˠ-ˤᴀ-ᴥᴬ-ᵜᵢ-ᵥᵫ-ᵷᵹ-ᶾḀ-ỿⁱⁿₐ-ₜKÅℲⅎⅠ-ↈⱠ-ⱿꜢ-ꞇꞋ-ꞭꞰ-ꞷꟷ-ꟿꬰ-ꭚꭜ-ꭤff-stＡ-Ｚａ-ｚ",e.no.trimmer=e.trimmerSupport.generateTrimmer(e.no.wordCharacters),e.Pipeline.registerFunction(e.no.trimmer,"trimmer-no"),e.no.stemmer=function(){var r=e.stemmerSupport.Among,n=e.stemmerSupport.SnowballProgram,i=new function(){function e(){var e,r=w.cursor+3;if(a=w.limit,0<=r||r<=w.limit){for(s=r;;){if(e=w.cursor,w.in_grouping(d,97,248)){w.cursor=e;break}if(e>=w.limit)return;w.cursor=e+1}for(;!w.out_grouping(d,97,248);){if(w.cursor>=w.limit)return;w.cursor++}a=w.cursor,a<s&&(a=s)}}function i(){var e,r,n;if(w.cursor>=a&&(r=w.limit_backward,w.limit_backward=a,w.ket=w.cursor,e=w.find_among_b(m,29),w.limit_backward=r,e))switch(w.bra=w.cursor,e){case 1:w.slice_del();break;case 2:n=w.limit-w.cursor,w.in_grouping_b(c,98,122)?w.slice_del():(w.cursor=w.limit-n,w.eq_s_b(1,"k")&&w.out_grouping_b(d,97,248)&&w.slice_del());break;case 3:w.slice_from("er")}}function t(){var e,r=w.limit-w.cursor;w.cursor>=a&&(e=w.limit_backward,w.limit_backward=a,w.ket=w.cursor,w.find_among_b(u,2)?(w.bra=w.cursor,w.limit_backward=e,w.cursor=w.limit-r,w.cursor>w.limit_backward&&(w.cursor--,w.bra=w.cursor,w.slice_del())):w.limit_backward=e)}function o(){var e,r;w.cursor>=a&&(r=w.limit_backward,w.limit_backward=a,w.ket=w.cursor,e=w.find_among_b(l,11),e?(w.bra=w.cursor,w.limit_backward=r,1==e&&w.slice_del()):w.limit_backward=r)}var s,a,m=[new r("a",-1,1),new r("e",-1,1),new r("ede",1,1),new r("ande",1,1),new r("ende",1,1),new r("ane",1,1),new r("ene",1,1),new r("hetene",6,1),new r("erte",1,3),new r("en",-1,1),new r("heten",9,1),new r("ar",-1,1),new r("er",-1,1),new r("heter",12,1),new r("s",-1,2),new r("as",14,1),new r("es",14,1),new r("edes",16,1),new r("endes",16,1),new r("enes",16,1),new r("hetenes",19,1),new r("ens",14,1),new r("hetens",21,1),new r("ers",14,1),new r("ets",14,1),new r("et",-1,1),new r("het",25,1),new r("ert",-1,3),new r("ast",-1,1)],u=[new r("dt",-1,-1),new r("vt",-1,-1)],l=[new r("leg",-1,1),new r("eleg",0,1),new r("ig",-1,1),new r("eig",2,1),new r("lig",2,1),new r("elig",4,1),new r("els",-1,1),new r("lov",-1,1),new r("elov",7,1),new r("slov",7,1),new r("hetslov",9,1)],d=[17,65,16,1,0,0,0,0,0,0,0,0,0,0,0,0,48,0,128],c=[119,125,149,1],w=new n;this.setCurrent=function(e){w.setCurrent(e)},this.getCurrent=function(){return w.getCurrent()},this.stem=function(){var r=w.cursor;return e(),w.limit_backward=r,w.cursor=w.limit,i(),w.cursor=w.limit,t(),w.cursor=w.limit,o(),!0}};return function(e){return"function"==typeof e.update?e.update(function(e){return i.setCurrent(e),i.stem(),i.getCurrent()}):(i.setCurrent(e),i.stem(),i.getCurrent())}}(),e.Pipeline.registerFunction(e.no.stemmer,"stemmer-no"),e.no.stopWordFilter=e.generateStopWordFilter("alle at av bare begge ble blei bli blir blitt både båe da de deg dei deim deira deires dem den denne der dere deres det dette di din disse ditt du dykk dykkar då eg ein eit eitt eller elles en enn er et ett etter for fordi fra før ha hadde han hans har hennar henne hennes her hjå ho hoe honom hoss hossen hun hva hvem hver hvilke hvilken hvis hvor hvordan hvorfor i ikke ikkje ikkje ingen ingi inkje inn inni ja jeg kan kom korleis korso kun kunne kva kvar kvarhelst kven kvi kvifor man mange me med medan meg meget mellom men mi min mine mitt mot mykje ned no noe noen noka noko nokon nokor nokre nå når og også om opp oss over på samme seg selv si si sia sidan siden sin sine sitt sjøl skal skulle slik so som som somme somt så sånn til um upp ut uten var vart varte ved vere verte vi vil ville vore vors vort vår være være vært å".split(" ")),e.Pipeline.registerFunction(e.no.stopWordFilter,"stopWordFilter-no")}});

18
v0.25.0/assets/javascripts/lunr/min/lunr.pt.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.25.0/assets/javascripts/lunr/min/lunr.ro.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.25.0/assets/javascripts/lunr/min/lunr.ru.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.25.0/assets/javascripts/lunr/min/lunr.sa.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.sa=function(){this.pipeline.reset(),this.pipeline.add(e.sa.trimmer,e.sa.stopWordFilter,e.sa.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.sa.stemmer))},e.sa.wordCharacters="ऀ-ःऄ-एऐ-टठ-यर-िी-ॏॐ-य़ॠ-९॰-ॿ꣠-꣱ꣲ-ꣷ꣸-ꣻ꣼-ꣽꣾ-ꣿᆰ0-ᆰ9",e.sa.trimmer=e.trimmerSupport.generateTrimmer(e.sa.wordCharacters),e.Pipeline.registerFunction(e.sa.trimmer,"trimmer-sa"),e.sa.stopWordFilter=e.generateStopWordFilter('तथा अयम्‌ एकम्‌ इत्यस्मिन्‌ तथा तत्‌ वा अयम्‌ इत्यस्य ते आहूत उपरि तेषाम्‌ किन्तु तेषाम्‌ तदा इत्यनेन अधिकः इत्यस्य तत्‌ केचन बहवः द्वि तथा महत्वपूर्णः अयम्‌ अस्य विषये अयं अस्ति तत्‌ प्रथमः विषये इत्युपरि इत्युपरि इतर अधिकतमः अधिकः अपि सामान्यतया ठ इतरेतर नूतनम्‌ द न्यूनम्‌ कश्चित्‌ वा विशालः द सः अस्ति तदनुसारम् तत्र अस्ति केवलम्‌ अपि अत्र सर्वे विविधाः तत्‌ बहवः यतः इदानीम्‌ द दक्षिण इत्यस्मै तस्य उपरि नथ अतीव कार्यम्‌ सर्वे एकैकम्‌ इत्यादि। एते सन्ति उत इत्थम्‌ मध्ये एतदर्थं . स कस्य प्रथमः श्री. करोति अस्मिन् प्रकारः निर्मिता कालः तत्र कर्तुं समान अधुना ते सन्ति स एकः अस्ति सः अर्थात् तेषां कृते . स्थितम् विशेषः अग्रिम तेषाम्‌ समान स्रोतः ख म समान इदानीमपि अधिकतया करोतु ते समान इत्यस्य वीथी सह यस्मिन् कृतवान्‌ धृतः तदा पुनः पूर्वं सः आगतः किम्‌ कुल इतर पुरा मात्रा स विषये उ अतएव अपि नगरस्य उपरि यतः प्रतिशतं कतरः कालः साधनानि भूत तथापि जात सम्बन्धि अन्यत्‌ ग अतः अस्माकं स्वकीयाः अस्माकं इदानीं अन्तः इत्यादयः भवन्तः इत्यादयः एते एताः तस्य अस्य इदम् एते तेषां तेषां तेषां तान् तेषां तेषां तेषां समानः सः एकः च तादृशाः बहवः अन्ये च वदन्ति यत् कियत् कस्मै कस्मै यस्मै यस्मै यस्मै यस्मै न अतिनीचः किन्तु प्रथमं सम्पूर्णतया ततः चिरकालानन्तरं पुस्तकं सम्पूर्णतया अन्तः किन्तु अत्र वा इह इव श्रद्धाय अवशिष्यते परन्तु अन्ये वर्गाः सन्ति ते सन्ति शक्नुवन्ति सर्वे मिलित्वा सर्वे एकत्र"'.split(" ")),e.sa.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var r=e.wordcut;r.init(),e.sa.tokenizer=function(t){if(!arguments.length||null==t||void 0==t)return[];if(Array.isArray(t))return t.map(function(r){return isLunr2?new e.Token(r.toLowerCase()):r.toLowerCase()});var i=t.toString().toLowerCase().replace(/^\s+/,"");return r.cut(i).split("|")},e.Pipeline.registerFunction(e.sa.stemmer,"stemmer-sa"),e.Pipeline.registerFunction(e.sa.stopWordFilter,"stopWordFilter-sa")}});

1
v0.25.0/assets/javascripts/lunr/min/lunr.stemmer.support.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(r,t){"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():t()(r.lunr)}(this,function(){return function(r){r.stemmerSupport={Among:function(r,t,i,s){if(this.toCharArray=function(r){for(var t=r.length,i=new Array(t),s=0;s<t;s++)i[s]=r.charCodeAt(s);return i},!r&&""!=r||!t&&0!=t||!i)throw"Bad Among initialisation: s:"+r+", substring_i: "+t+", result: "+i;this.s_size=r.length,this.s=this.toCharArray(r),this.substring_i=t,this.result=i,this.method=s},SnowballProgram:function(){var r;return{bra:0,ket:0,limit:0,cursor:0,limit_backward:0,setCurrent:function(t){r=t,this.cursor=0,this.limit=t.length,this.limit_backward=0,this.bra=this.cursor,this.ket=this.limit},getCurrent:function(){var t=r;return r=null,t},in_grouping:function(t,i,s){if(this.cursor<this.limit){var e=r.charCodeAt(this.cursor);if(e<=s&&e>=i&&(e-=i,t[e>>3]&1<<(7&e)))return this.cursor++,!0}return!1},in_grouping_b:function(t,i,s){if(this.cursor>this.limit_backward){var e=r.charCodeAt(this.cursor-1);if(e<=s&&e>=i&&(e-=i,t[e>>3]&1<<(7&e)))return this.cursor--,!0}return!1},out_grouping:function(t,i,s){if(this.cursor<this.limit){var e=r.charCodeAt(this.cursor);if(e>s||e<i)return this.cursor++,!0;if(e-=i,!(t[e>>3]&1<<(7&e)))return this.cursor++,!0}return!1},out_grouping_b:function(t,i,s){if(this.cursor>this.limit_backward){var e=r.charCodeAt(this.cursor-1);if(e>s||e<i)return this.cursor--,!0;if(e-=i,!(t[e>>3]&1<<(7&e)))return this.cursor--,!0}return!1},eq_s:function(t,i){if(this.limit-this.cursor<t)return!1;for(var s=0;s<t;s++)if(r.charCodeAt(this.cursor+s)!=i.charCodeAt(s))return!1;return this.cursor+=t,!0},eq_s_b:function(t,i){if(this.cursor-this.limit_backward<t)return!1;for(var s=0;s<t;s++)if(r.charCodeAt(this.cursor-t+s)!=i.charCodeAt(s))return!1;return this.cursor-=t,!0},find_among:function(t,i){for(var s=0,e=i,n=this.cursor,u=this.limit,o=0,h=0,c=!1;;){for(var a=s+(e-s>>1),f=0,l=o<h?o:h,_=t[a],m=l;m<_.s_size;m++){if(n+l==u){f=-1;break}if(f=r.charCodeAt(n+l)-_.s[m])break;l++}if(f<0?(e=a,h=l):(s=a,o=l),e-s<=1){if(s>0||e==s||c)break;c=!0}}for(;;){var _=t[s];if(o>=_.s_size){if(this.cursor=n+_.s_size,!_.method)return _.result;var b=_.method();if(this.cursor=n+_.s_size,b)return _.result}if((s=_.substring_i)<0)return 0}},find_among_b:function(t,i){for(var s=0,e=i,n=this.cursor,u=this.limit_backward,o=0,h=0,c=!1;;){for(var a=s+(e-s>>1),f=0,l=o<h?o:h,_=t[a],m=_.s_size-1-l;m>=0;m--){if(n-l==u){f=-1;break}if(f=r.charCodeAt(n-1-l)-_.s[m])break;l++}if(f<0?(e=a,h=l):(s=a,o=l),e-s<=1){if(s>0||e==s||c)break;c=!0}}for(;;){var _=t[s];if(o>=_.s_size){if(this.cursor=n-_.s_size,!_.method)return _.result;var b=_.method();if(this.cursor=n-_.s_size,b)return _.result}if((s=_.substring_i)<0)return 0}},replace_s:function(t,i,s){var e=s.length-(i-t),n=r.substring(0,t),u=r.substring(i);return r=n+s+u,this.limit+=e,this.cursor>=i?this.cursor+=e:this.cursor>t&&(this.cursor=t),e},slice_check:function(){if(this.bra<0||this.bra>this.ket||this.ket>this.limit||this.limit>r.length)throw"faulty slice operation"},slice_from:function(r){this.slice_check(),this.replace_s(this.bra,this.ket,r)},slice_del:function(){this.slice_from("")},insert:function(r,t,i){var s=this.replace_s(r,t,i);r<=this.bra&&(this.bra+=s),r<=this.ket&&(this.ket+=s)},slice_to:function(){return this.slice_check(),r.substring(this.bra,this.ket)},eq_v_b:function(r){return this.eq_s_b(r.length,r)}}}},r.trimmerSupport={generateTrimmer:function(r){var t=new RegExp("^[^"+r+"]+"),i=new RegExp("[^"+r+"]+$");return function(r){return"function"==typeof r.update?r.update(function(r){return r.replace(t,"").replace(i,"")}):r.replace(t,"").replace(i,"")}}}}});

18
v0.25.0/assets/javascripts/lunr/min/lunr.sv.min.js vendored Normal file
View File

@ -0,0 +1,18 @@
/*!
* Lunr languages, `Swedish` language
* https://github.com/MihaiValentin/lunr-languages
*
* Copyright 2014, Mihai Valentin
* http://www.mozilla.org/MPL/
*/
/*!
* based on
* Snowball JavaScript Library v0.3
* http://code.google.com/p/urim/
* http://snowball.tartarus.org/
*
* Copyright 2010, Oleg Mazko
* http://www.mozilla.org/MPL/
*/
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.sv=function(){this.pipeline.reset(),this.pipeline.add(e.sv.trimmer,e.sv.stopWordFilter,e.sv.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.sv.stemmer))},e.sv.wordCharacters="A-Za-zªºÀ-ÖØ-öø-ʸˠ-ˤᴀ-ᴥᴬ-ᵜᵢ-ᵥᵫ-ᵷᵹ-ᶾḀ-ỿⁱⁿₐ-ₜKÅℲⅎⅠ-ↈⱠ-ⱿꜢ-ꞇꞋ-ꞭꞰ-ꞷꟷ-ꟿꬰ-ꭚꭜ-ꭤff-stＡ-Ｚａ-ｚ",e.sv.trimmer=e.trimmerSupport.generateTrimmer(e.sv.wordCharacters),e.Pipeline.registerFunction(e.sv.trimmer,"trimmer-sv"),e.sv.stemmer=function(){var r=e.stemmerSupport.Among,n=e.stemmerSupport.SnowballProgram,t=new function(){function e(){var e,r=w.cursor+3;if(o=w.limit,0<=r||r<=w.limit){for(a=r;;){if(e=w.cursor,w.in_grouping(l,97,246)){w.cursor=e;break}if(w.cursor=e,w.cursor>=w.limit)return;w.cursor++}for(;!w.out_grouping(l,97,246);){if(w.cursor>=w.limit)return;w.cursor++}o=w.cursor,o<a&&(o=a)}}function t(){var e,r=w.limit_backward;if(w.cursor>=o&&(w.limit_backward=o,w.cursor=w.limit,w.ket=w.cursor,e=w.find_among_b(u,37),w.limit_backward=r,e))switch(w.bra=w.cursor,e){case 1:w.slice_del();break;case 2:w.in_grouping_b(d,98,121)&&w.slice_del()}}function i(){var e=w.limit_backward;w.cursor>=o&&(w.limit_backward=o,w.cursor=w.limit,w.find_among_b(c,7)&&(w.cursor=w.limit,w.ket=w.cursor,w.cursor>w.limit_backward&&(w.bra=--w.cursor,w.slice_del())),w.limit_backward=e)}function s(){var e,r;if(w.cursor>=o){if(r=w.limit_backward,w.limit_backward=o,w.cursor=w.limit,w.ket=w.cursor,e=w.find_among_b(m,5))switch(w.bra=w.cursor,e){case 1:w.slice_del();break;case 2:w.slice_from("lös");break;case 3:w.slice_from("full")}w.limit_backward=r}}var a,o,u=[new r("a",-1,1),new r("arna",0,1),new r("erna",0,1),new r("heterna",2,1),new r("orna",0,1),new r("ad",-1,1),new r("e",-1,1),new r("ade",6,1),new r("ande",6,1),new r("arne",6,1),new r("are",6,1),new r("aste",6,1),new r("en",-1,1),new r("anden",12,1),new r("aren",12,1),new r("heten",12,1),new r("ern",-1,1),new r("ar",-1,1),new r("er",-1,1),new r("heter",18,1),new r("or",-1,1),new r("s",-1,2),new r("as",21,1),new r("arnas",22,1),new r("ernas",22,1),new r("ornas",22,1),new r("es",21,1),new r("ades",26,1),new r("andes",26,1),new r("ens",21,1),new r("arens",29,1),new r("hetens",29,1),new r("erns",21,1),new r("at",-1,1),new r("andet",-1,1),new r("het",-1,1),new r("ast",-1,1)],c=[new r("dd",-1,-1),new r("gd",-1,-1),new r("nn",-1,-1),new r("dt",-1,-1),new r("gt",-1,-1),new r("kt",-1,-1),new r("tt",-1,-1)],m=[new r("ig",-1,1),new r("lig",0,1),new r("els",-1,1),new r("fullt",-1,3),new r("löst",-1,2)],l=[17,65,16,1,0,0,0,0,0,0,0,0,0,0,0,0,24,0,32],d=[119,127,149],w=new n;this.setCurrent=function(e){w.setCurrent(e)},this.getCurrent=function(){return w.getCurrent()},this.stem=function(){var r=w.cursor;return e(),w.limit_backward=r,w.cursor=w.limit,t(),w.cursor=w.limit,i(),w.cursor=w.limit,s(),!0}};return function(e){return"function"==typeof e.update?e.update(function(e){return t.setCurrent(e),t.stem(),t.getCurrent()}):(t.setCurrent(e),t.stem(),t.getCurrent())}}(),e.Pipeline.registerFunction(e.sv.stemmer,"stemmer-sv"),e.sv.stopWordFilter=e.generateStopWordFilter("alla allt att av blev bli blir blivit de dem den denna deras dess dessa det detta dig din dina ditt du där då efter ej eller en er era ert ett från för ha hade han hans har henne hennes hon honom hur här i icke ingen inom inte jag ju kan kunde man med mellan men mig min mina mitt mot mycket ni nu när någon något några och om oss på samma sedan sig sin sina sitta själv skulle som så sådan sådana sådant till under upp ut utan vad var vara varför varit varje vars vart vem vi vid vilka vilkas vilken vilket vår våra vårt än är åt över".split(" ")),e.Pipeline.registerFunction(e.sv.stopWordFilter,"stopWordFilter-sv")}});

1
v0.25.0/assets/javascripts/lunr/min/lunr.ta.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,t){"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():t()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.ta=function(){this.pipeline.reset(),this.pipeline.add(e.ta.trimmer,e.ta.stopWordFilter,e.ta.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.ta.stemmer))},e.ta.wordCharacters="஀-உஊ-ஏஐ-ஙச-ட஠-னப-யர-ஹ஺-ிீ-௉ொ-௏ௐ-௙௚-௟௠-௩௪-௯௰-௹௺-௿a-zA-Zａ-ｚＡ-Ｚ0-9０-９",e.ta.trimmer=e.trimmerSupport.generateTrimmer(e.ta.wordCharacters),e.Pipeline.registerFunction(e.ta.trimmer,"trimmer-ta"),e.ta.stopWordFilter=e.generateStopWordFilter("அங்கு அங்கே அது அதை அந்த அவர் அவர்கள் அவள் அவன் அவை ஆக ஆகவே ஆகையால் ஆதலால் ஆதலினால் ஆனாலும் ஆனால் இங்கு இங்கே இது இதை இந்த இப்படி இவர் இவர்கள் இவள் இவன் இவை இவ்வளவு உனக்கு உனது உன் உன்னால் எங்கு எங்கே எது எதை எந்த எப்படி எவர் எவர்கள் எவள் எவன் எவை எவ்வளவு எனக்கு எனது எனவே என் என்ன என்னால் ஏது ஏன் தனது தன்னால் தானே தான் நாங்கள் நாம் நான் நீ நீங்கள்".split(" ")),e.ta.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var t=e.wordcut;t.init(),e.ta.tokenizer=function(r){if(!arguments.length||null==r||void 0==r)return[];if(Array.isArray(r))return r.map(function(t){return isLunr2?new e.Token(t.toLowerCase()):t.toLowerCase()});var i=r.toString().toLowerCase().replace(/^\s+/,"");return t.cut(i).split("|")},e.Pipeline.registerFunction(e.ta.stemmer,"stemmer-ta"),e.Pipeline.registerFunction(e.ta.stopWordFilter,"stopWordFilter-ta")}});

1
v0.25.0/assets/javascripts/lunr/min/lunr.te.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,t){"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():t()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.te=function(){this.pipeline.reset(),this.pipeline.add(e.te.trimmer,e.te.stopWordFilter,e.te.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.te.stemmer))},e.te.wordCharacters="ఀ-ఄఅ-ఔక-హా-ౌౕ-ౖౘ-ౚౠ-ౡౢ-ౣ౦-౯౸-౿఼ఽ్ౝ౷౤౥",e.te.trimmer=e.trimmerSupport.generateTrimmer(e.te.wordCharacters),e.Pipeline.registerFunction(e.te.trimmer,"trimmer-te"),e.te.stopWordFilter=e.generateStopWordFilter("అందరూ అందుబాటులో అడగండి అడగడం అడ్డంగా అనుగుణంగా అనుమతించు అనుమతిస్తుంది అయితే ఇప్పటికే ఉన్నారు ఎక్కడైనా ఎప్పుడు ఎవరైనా ఎవరో ఏ ఏదైనా ఏమైనప్పటికి ఒక ఒకరు కనిపిస్తాయి కాదు కూడా గా గురించి చుట్టూ చేయగలిగింది తగిన తర్వాత దాదాపు దూరంగా నిజంగా పై ప్రకారం ప్రక్కన మధ్య మరియు మరొక మళ్ళీ మాత్రమే మెచ్చుకో వద్ద వెంట వేరుగా వ్యతిరేకంగా సంబంధం".split(" ")),e.te.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var t=e.wordcut;t.init(),e.te.tokenizer=function(r){if(!arguments.length||null==r||void 0==r)return[];if(Array.isArray(r))return r.map(function(t){return isLunr2?new e.Token(t.toLowerCase()):t.toLowerCase()});var i=r.toString().toLowerCase().replace(/^\s+/,"");return t.cut(i).split("|")},e.Pipeline.registerFunction(e.te.stemmer,"stemmer-te"),e.Pipeline.registerFunction(e.te.stopWordFilter,"stopWordFilter-te")}});

1
v0.25.0/assets/javascripts/lunr/min/lunr.th.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");var r="2"==e.version[0];e.th=function(){this.pipeline.reset(),this.pipeline.add(e.th.trimmer),r?this.tokenizer=e.th.tokenizer:(e.tokenizer&&(e.tokenizer=e.th.tokenizer),this.tokenizerFn&&(this.tokenizerFn=e.th.tokenizer))},e.th.wordCharacters="[฀-๿]",e.th.trimmer=e.trimmerSupport.generateTrimmer(e.th.wordCharacters),e.Pipeline.registerFunction(e.th.trimmer,"trimmer-th");var t=e.wordcut;t.init(),e.th.tokenizer=function(i){if(!arguments.length||null==i||void 0==i)return[];if(Array.isArray(i))return i.map(function(t){return r?new e.Token(t):t});var n=i.toString().replace(/^\s+/,"");return t.cut(n).split("|")}}});

18
v0.25.0/assets/javascripts/lunr/min/lunr.tr.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.25.0/assets/javascripts/lunr/min/lunr.vi.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.vi=function(){this.pipeline.reset(),this.pipeline.add(e.vi.stopWordFilter,e.vi.trimmer)},e.vi.wordCharacters="[A-Za-ẓ̀͐́͑̉̃̓ÂâÊêÔôĂ-ăĐ-đƠ-ơƯ-ư]",e.vi.trimmer=e.trimmerSupport.generateTrimmer(e.vi.wordCharacters),e.Pipeline.registerFunction(e.vi.trimmer,"trimmer-vi"),e.vi.stopWordFilter=e.generateStopWordFilter("là cái nhưng mà".split(" "))}});

1
v0.25.0/assets/javascripts/lunr/min/lunr.zh.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r(require("@node-rs/jieba")):r()(e.lunr)}(this,function(e){return function(r,t){if(void 0===r)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===r.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");var i="2"==r.version[0];r.zh=function(){this.pipeline.reset(),this.pipeline.add(r.zh.trimmer,r.zh.stopWordFilter,r.zh.stemmer),i?this.tokenizer=r.zh.tokenizer:(r.tokenizer&&(r.tokenizer=r.zh.tokenizer),this.tokenizerFn&&(this.tokenizerFn=r.zh.tokenizer))},r.zh.tokenizer=function(n){if(!arguments.length||null==n||void 0==n)return[];if(Array.isArray(n))return n.map(function(e){return i?new r.Token(e.toLowerCase()):e.toLowerCase()});t&&e.load(t);var o=n.toString().trim().toLowerCase(),s=[];e.cut(o,!0).forEach(function(e){s=s.concat(e.split(" "))}),s=s.filter(function(e){return!!e});var u=0;return s.map(function(e,t){if(i){var n=o.indexOf(e,u),s={};return s.position=[n,e.length],s.index=t,u=n,new r.Token(e,s)}return e})},r.zh.wordCharacters="\\w一-龥",r.zh.trimmer=r.trimmerSupport.generateTrimmer(r.zh.wordCharacters),r.Pipeline.registerFunction(r.zh.trimmer,"trimmer-zh"),r.zh.stemmer=function(){return function(e){return e}}(),r.Pipeline.registerFunction(r.zh.stemmer,"stemmer-zh"),r.zh.stopWordFilter=r.generateStopWordFilter("的 一 不 在 人 有 是 为 為 以 于 於 上 他 而 后 後 之 来 來 及 了 因 下 可 到 由 这 這 与 與 也 此 但 并 並 个 個 其 已 无 無 小 我 们 們 起 最 再 今 去 好 只 又 或 很 亦 某 把 那 你 乃 它 吧 被 比 别 趁 当 當 从 從 得 打 凡 儿 兒 尔 爾 该 該 各 给 給 跟 和 何 还 還 即 几 幾 既 看 据 據 距 靠 啦 另 么 麽 每 嘛 拿 哪 您 凭 憑 且 却 卻 让 讓 仍 啥 如 若 使 谁 誰 虽 雖 随 隨 同 所 她 哇 嗡 往 些 向 沿 哟 喲 用 咱 则 則 怎 曾 至 致 着 著 诸 諸 自".split(" ")),r.Pipeline.registerFunction(r.zh.stopWordFilter,"stopWordFilter-zh")}});

206
v0.25.0/assets/javascripts/lunr/tinyseg.js Normal file
View File

@ -0,0 +1,206 @@
/**
* export the module via AMD, CommonJS or as a browser global
* Export code from https://github.com/umdjs/umd/blob/master/returnExports.js
*/
;(function (root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(factory)
} else if (typeof exports === 'object') {
/**
* Node. Does not work with strict CommonJS, but
* only CommonJS-like environments that support module.exports,
* like Node.
*/
module.exports = factory()
} else {
// Browser globals (root is window)
factory()(root.lunr);
}
}(this, function () {
/**
* Just return a value to define the module export.
* This example returns an object, but the module
* can return a function as the exported value.
*/
return function(lunr) {
// TinySegmenter 0.1 -- Super compact Japanese tokenizer in Javascript
// (c) 2008 Taku Kudo <taku@chasen.org>
// TinySegmenter is freely distributable under the terms of a new BSD licence.
// For details, see http://chasen.org/~taku/software/TinySegmenter/LICENCE.txt
function TinySegmenter() {
var patterns = {
"[一二三四五六七八九十百千万億兆]":"M",
"[一-龠々〆ヵヶ]":"H",
"[ぁ-ん]":"I",
"[ァ-ヴーｱ-ﾝﾞｰ]":"K",
"[a-zA-Zａ-ｚＡ-Ｚ]":"A",
"[0-9０-９]":"N"
}
this.chartype_ = [];
for (var i in patterns) {
var regexp = new RegExp(i);
this.chartype_.push([regexp, patterns[i]]);
}
this.BIAS__ = -332
this.BC1__ = {"HH":6,"II":2461,"KH":406,"OH":-1378};
this.BC2__ = {"AA":-3267,"AI":2744,"AN":-878,"HH":-4070,"HM":-1711,"HN":4012,"HO":3761,"IA":1327,"IH":-1184,"II":-1332,"IK":1721,"IO":5492,"KI":3831,"KK":-8741,"MH":-3132,"MK":3334,"OO":-2920};
this.BC3__ = {"HH":996,"HI":626,"HK":-721,"HN":-1307,"HO":-836,"IH":-301,"KK":2762,"MK":1079,"MM":4034,"OA":-1652,"OH":266};
this.BP1__ = {"BB":295,"OB":304,"OO":-125,"UB":352};
this.BP2__ = {"BO":60,"OO":-1762};
this.BQ1__ = {"BHH":1150,"BHM":1521,"BII":-1158,"BIM":886,"BMH":1208,"BNH":449,"BOH":-91,"BOO":-2597,"OHI":451,"OIH":-296,"OKA":1851,"OKH":-1020,"OKK":904,"OOO":2965};
this.BQ2__ = {"BHH":118,"BHI":-1159,"BHM":466,"BIH":-919,"BKK":-1720,"BKO":864,"OHH":-1139,"OHM":-181,"OIH":153,"UHI":-1146};
this.BQ3__ = {"BHH":-792,"BHI":2664,"BII":-299,"BKI":419,"BMH":937,"BMM":8335,"BNN":998,"BOH":775,"OHH":2174,"OHM":439,"OII":280,"OKH":1798,"OKI":-793,"OKO":-2242,"OMH":-2402,"OOO":11699};
this.BQ4__ = {"BHH":-3895,"BIH":3761,"BII":-4654,"BIK":1348,"BKK":-1806,"BMI":-3385,"BOO":-12396,"OAH":926,"OHH":266,"OHK":-2036,"ONN":-973};
this.BW1__ = {",と":660,",同":727,"B1あ":1404,"B1同":542,"、と":660,"、同":727,"」と":1682,"あっ":1505,"いう":1743,"いっ":-2055,"いる":672,"うし":-4817,"うん":665,"から":3472,"がら":600,"こう":-790,"こと":2083,"こん":-1262,"さら":-4143,"さん":4573,"した":2641,"して":1104,"すで":-3399,"そこ":1977,"それ":-871,"たち":1122,"ため":601,"った":3463,"つい":-802,"てい":805,"てき":1249,"でき":1127,"です":3445,"では":844,"とい":-4915,"とみ":1922,"どこ":3887,"ない":5713,"なっ":3015,"など":7379,"なん":-1113,"にし":2468,"には":1498,"にも":1671,"に対":-912,"の一":-501,"の中":741,"ませ":2448,"まで":1711,"まま":2600,"まる":-2155,"やむ":-1947,"よっ":-2565,"れた":2369,"れで":-913,"をし":1860,"を見":731,"亡く":-1886,"京都":2558,"取り":-2784,"大き":-2604,"大阪":1497,"平方":-2314,"引き":-1336,"日本":-195,"本当":-2423,"毎日":-2113,"目指":-724,"Ｂ１あ":1404,"Ｂ１同":542,"｣と":1682};
this.BW2__ = {"..":-11822,"11":-669,"――":-5730,"−−":-13175,"いう":-1609,"うか":2490,"かし":-1350,"かも":-602,"から":-7194,"かれ":4612,"がい":853,"がら":-3198,"きた":1941,"くな":-1597,"こと":-8392,"この":-4193,"させ":4533,"され":13168,"さん":-3977,"しい":-1819,"しか":-545,"した":5078,"して":972,"しな":939,"その":-3744,"たい":-1253,"たた":-662,"ただ":-3857,"たち":-786,"たと":1224,"たは":-939,"った":4589,"って":1647,"っと":-2094,"てい":6144,"てき":3640,"てく":2551,"ては":-3110,"ても":-3065,"でい":2666,"でき":-1528,"でし":-3828,"です":-4761,"でも":-4203,"とい":1890,"とこ":-1746,"とと":-2279,"との":720,"とみ":5168,"とも":-3941,"ない":-2488,"なが":-1313,"など":-6509,"なの":2614,"なん":3099,"にお":-1615,"にし":2748,"にな":2454,"によ":-7236,"に対":-14943,"に従":-4688,"に関":-11388,"のか":2093,"ので":-7059,"のに":-6041,"のの":-6125,"はい":1073,"はが":-1033,"はず":-2532,"ばれ":1813,"まし":-1316,"まで":-6621,"まれ":5409,"めて":-3153,"もい":2230,"もの":-10713,"らか":-944,"らし":-1611,"らに":-1897,"りし":651,"りま":1620,"れた":4270,"れて":849,"れば":4114,"ろう":6067,"われ":7901,"を通":-11877,"んだ":728,"んな":-4115,"一人":602,"一方":-1375,"一日":970,"一部":-1051,"上が":-4479,"会社":-1116,"出て":2163,"分の":-7758,"同党":970,"同日":-913,"大阪":-2471,"委員":-1250,"少な":-1050,"年度":-8669,"年間":-1626,"府県":-2363,"手権":-1982,"新聞":-4066,"日新":-722,"日本":-7068,"日米":3372,"曜日":-601,"朝鮮":-2355,"本人":-2697,"東京":-1543,"然と":-1384,"社会":-1276,"立て":-990,"第に":-1612,"米国":-4268,"１１":-669};
this.BW3__ = {"あた":-2194,"あり":719,"ある":3846,"い.":-1185,"い。":-1185,"いい":5308,"いえ":2079,"いく":3029,"いた":2056,"いっ":1883,"いる":5600,"いわ":1527,"うち":1117,"うと":4798,"えと":1454,"か.":2857,"か。":2857,"かけ":-743,"かっ":-4098,"かに":-669,"から":6520,"かり":-2670,"が,":1816,"が、":1816,"がき":-4855,"がけ":-1127,"がっ":-913,"がら":-4977,"がり":-2064,"きた":1645,"けど":1374,"こと":7397,"この":1542,"ころ":-2757,"さい":-714,"さを":976,"し,":1557,"し、":1557,"しい":-3714,"した":3562,"して":1449,"しな":2608,"しま":1200,"す.":-1310,"す。":-1310,"する":6521,"ず,":3426,"ず、":3426,"ずに":841,"そう":428,"た.":8875,"た。":8875,"たい":-594,"たの":812,"たり":-1183,"たる":-853,"だ.":4098,"だ。":4098,"だっ":1004,"った":-4748,"って":300,"てい":6240,"てお":855,"ても":302,"です":1437,"でに":-1482,"では":2295,"とう":-1387,"とし":2266,"との":541,"とも":-3543,"どう":4664,"ない":1796,"なく":-903,"など":2135,"に,":-1021,"に、":-1021,"にし":1771,"にな":1906,"には":2644,"の,":-724,"の、":-724,"の子":-1000,"は,":1337,"は、":1337,"べき":2181,"まし":1113,"ます":6943,"まっ":-1549,"まで":6154,"まれ":-793,"らし":1479,"られ":6820,"るる":3818,"れ,":854,"れ、":854,"れた":1850,"れて":1375,"れば":-3246,"れる":1091,"われ":-605,"んだ":606,"んで":798,"カ月":990,"会議":860,"入り":1232,"大会":2217,"始め":1681,"市":965,"新聞":-5055,"日,":974,"日、":974,"社会":2024,"ｶ月":990};
this.TC1__ = {"AAA":1093,"HHH":1029,"HHM":580,"HII":998,"HOH":-390,"HOM":-331,"IHI":1169,"IOH":-142,"IOI":-1015,"IOM":467,"MMH":187,"OOI":-1832};
this.TC2__ = {"HHO":2088,"HII":-1023,"HMM":-1154,"IHI":-1965,"KKH":703,"OII":-2649};
this.TC3__ = {"AAA":-294,"HHH":346,"HHI":-341,"HII":-1088,"HIK":731,"HOH":-1486,"IHH":128,"IHI":-3041,"IHO":-1935,"IIH":-825,"IIM":-1035,"IOI":-542,"KHH":-1216,"KKA":491,"KKH":-1217,"KOK":-1009,"MHH":-2694,"MHM":-457,"MHO":123,"MMH":-471,"NNH":-1689,"NNO":662,"OHO":-3393};
this.TC4__ = {"HHH":-203,"HHI":1344,"HHK":365,"HHM":-122,"HHN":182,"HHO":669,"HIH":804,"HII":679,"HOH":446,"IHH":695,"IHO":-2324,"IIH":321,"III":1497,"IIO":656,"IOO":54,"KAK":4845,"KKA":3386,"KKK":3065,"MHH":-405,"MHI":201,"MMH":-241,"MMM":661,"MOM":841};
this.TQ1__ = {"BHHH":-227,"BHHI":316,"BHIH":-132,"BIHH":60,"BIII":1595,"BNHH":-744,"BOHH":225,"BOOO":-908,"OAKK":482,"OHHH":281,"OHIH":249,"OIHI":200,"OIIH":-68};
this.TQ2__ = {"BIHH":-1401,"BIII":-1033,"BKAK":-543,"BOOO":-5591};
this.TQ3__ = {"BHHH":478,"BHHM":-1073,"BHIH":222,"BHII":-504,"BIIH":-116,"BIII":-105,"BMHI":-863,"BMHM":-464,"BOMH":620,"OHHH":346,"OHHI":1729,"OHII":997,"OHMH":481,"OIHH":623,"OIIH":1344,"OKAK":2792,"OKHH":587,"OKKA":679,"OOHH":110,"OOII":-685};
this.TQ4__ = {"BHHH":-721,"BHHM":-3604,"BHII":-966,"BIIH":-607,"BIII":-2181,"OAAA":-2763,"OAKK":180,"OHHH":-294,"OHHI":2446,"OHHO":480,"OHIH":-1573,"OIHH":1935,"OIHI":-493,"OIIH":626,"OIII":-4007,"OKAK":-8156};
this.TW1__ = {"につい":-4681,"東京都":2026};
this.TW2__ = {"ある程":-2049,"いった":-1256,"ころが":-2434,"しょう":3873,"その後":-4430,"だって":-1049,"ていた":1833,"として":-4657,"ともに":-4517,"もので":1882,"一気に":-792,"初めて":-1512,"同時に":-8097,"大きな":-1255,"対して":-2721,"社会党":-3216};
this.TW3__ = {"いただ":-1734,"してい":1314,"として":-4314,"につい":-5483,"にとっ":-5989,"に当た":-6247,"ので,":-727,"ので、":-727,"のもの":-600,"れから":-3752,"十二月":-2287};
this.TW4__ = {"いう.":8576,"いう。":8576,"からな":-2348,"してい":2958,"たが,":1516,"たが、":1516,"ている":1538,"という":1349,"ました":5543,"ません":1097,"ようと":-4258,"よると":5865};
this.UC1__ = {"A":484,"K":93,"M":645,"O":-505};
this.UC2__ = {"A":819,"H":1059,"I":409,"M":3987,"N":5775,"O":646};
this.UC3__ = {"A":-1370,"I":2311};
this.UC4__ = {"A":-2643,"H":1809,"I":-1032,"K":-3450,"M":3565,"N":3876,"O":6646};
this.UC5__ = {"H":313,"I":-1238,"K":-799,"M":539,"O":-831};
this.UC6__ = {"H":-506,"I":-253,"K":87,"M":247,"O":-387};
this.UP1__ = {"O":-214};
this.UP2__ = {"B":69,"O":935};
this.UP3__ = {"B":189};
this.UQ1__ = {"BH":21,"BI":-12,"BK":-99,"BN":142,"BO":-56,"OH":-95,"OI":477,"OK":410,"OO":-2422};
this.UQ2__ = {"BH":216,"BI":113,"OK":1759};
this.UQ3__ = {"BA":-479,"BH":42,"BI":1913,"BK":-7198,"BM":3160,"BN":6427,"BO":14761,"OI":-827,"ON":-3212};
this.UW1__ = {",":156,"、":156,"「":-463,"あ":-941,"う":-127,"が":-553,"き":121,"こ":505,"で":-201,"と":-547,"ど":-123,"に":-789,"の":-185,"は":-847,"も":-466,"や":-470,"よ":182,"ら":-292,"り":208,"れ":169,"を":-446,"ん":-137,"・":-135,"主":-402,"京":-268,"区":-912,"午":871,"国":-460,"大":561,"委":729,"市":-411,"日":-141,"理":361,"生":-408,"県":-386,"都":-718,"｢":-463,"･":-135};
this.UW2__ = {",":-829,"、":-829,"〇":892,"「":-645,"」":3145,"あ":-538,"い":505,"う":134,"お":-502,"か":1454,"が":-856,"く":-412,"こ":1141,"さ":878,"ざ":540,"し":1529,"す":-675,"せ":300,"そ":-1011,"た":188,"だ":1837,"つ":-949,"て":-291,"で":-268,"と":-981,"ど":1273,"な":1063,"に":-1764,"の":130,"は":-409,"ひ":-1273,"べ":1261,"ま":600,"も":-1263,"や":-402,"よ":1639,"り":-579,"る":-694,"れ":571,"を":-2516,"ん":2095,"ア":-587,"カ":306,"キ":568,"ッ":831,"三":-758,"不":-2150,"世":-302,"中":-968,"主":-861,"事":492,"人":-123,"会":978,"保":362,"入":548,"初":-3025,"副":-1566,"北":-3414,"区":-422,"大":-1769,"天":-865,"太":-483,"子":-1519,"学":760,"実":1023,"小":-2009,"市":-813,"年":-1060,"強":1067,"手":-1519,"揺":-1033,"政":1522,"文":-1355,"新":-1682,"日":-1815,"明":-1462,"最":-630,"朝":-1843,"本":-1650,"東":-931,"果":-665,"次":-2378,"民":-180,"気":-1740,"理":752,"発":529,"目":-1584,"相":-242,"県":-1165,"立":-763,"第":810,"米":509,"自":-1353,"行":838,"西":-744,"見":-3874,"調":1010,"議":1198,"込":3041,"開":1758,"間":-1257,"｢":-645,"｣":3145,"ｯ":831,"ｱ":-587,"ｶ":306,"ｷ":568};
this.UW3__ = {",":4889,"1":-800,"−":-1723,"、":4889,"々":-2311,"〇":5827,"」":2670,"〓":-3573,"あ":-2696,"い":1006,"う":2342,"え":1983,"お":-4864,"か":-1163,"が":3271,"く":1004,"け":388,"げ":401,"こ":-3552,"ご":-3116,"さ":-1058,"し":-395,"す":584,"せ":3685,"そ":-5228,"た":842,"ち":-521,"っ":-1444,"つ":-1081,"て":6167,"で":2318,"と":1691,"ど":-899,"な":-2788,"に":2745,"の":4056,"は":4555,"ひ":-2171,"ふ":-1798,"へ":1199,"ほ":-5516,"ま":-4384,"み":-120,"め":1205,"も":2323,"や":-788,"よ":-202,"ら":727,"り":649,"る":5905,"れ":2773,"わ":-1207,"を":6620,"ん":-518,"ア":551,"グ":1319,"ス":874,"ッ":-1350,"ト":521,"ム":1109,"ル":1591,"ロ":2201,"ン":278,"・":-3794,"一":-1619,"下":-1759,"世":-2087,"両":3815,"中":653,"主":-758,"予":-1193,"二":974,"人":2742,"今":792,"他":1889,"以":-1368,"低":811,"何":4265,"作":-361,"保":-2439,"元":4858,"党":3593,"全":1574,"公":-3030,"六":755,"共":-1880,"円":5807,"再":3095,"分":457,"初":2475,"別":1129,"前":2286,"副":4437,"力":365,"動":-949,"務":-1872,"化":1327,"北":-1038,"区":4646,"千":-2309,"午":-783,"協":-1006,"口":483,"右":1233,"各":3588,"合":-241,"同":3906,"和":-837,"員":4513,"国":642,"型":1389,"場":1219,"外":-241,"妻":2016,"学":-1356,"安":-423,"実":-1008,"家":1078,"小":-513,"少":-3102,"州":1155,"市":3197,"平":-1804,"年":2416,"広":-1030,"府":1605,"度":1452,"建":-2352,"当":-3885,"得":1905,"思":-1291,"性":1822,"戸":-488,"指":-3973,"政":-2013,"教":-1479,"数":3222,"文":-1489,"新":1764,"日":2099,"旧":5792,"昨":-661,"時":-1248,"曜":-951,"最":-937,"月":4125,"期":360,"李":3094,"村":364,"東":-805,"核":5156,"森":2438,"業":484,"氏":2613,"民":-1694,"決":-1073,"法":1868,"海":-495,"無":979,"物":461,"特":-3850,"生":-273,"用":914,"町":1215,"的":7313,"直":-1835,"省":792,"県":6293,"知":-1528,"私":4231,"税":401,"立":-960,"第":1201,"米":7767,"系":3066,"約":3663,"級":1384,"統":-4229,"総":1163,"線":1255,"者":6457,"能":725,"自":-2869,"英":785,"見":1044,"調":-562,"財":-733,"費":1777,"車":1835,"軍":1375,"込":-1504,"通":-1136,"選":-681,"郎":1026,"郡":4404,"部":1200,"金":2163,"長":421,"開":-1432,"間":1302,"関":-1282,"雨":2009,"電":-1045,"非":2066,"駅":1620,"１":-800,"｣":2670,"･":-3794,"ｯ":-1350,"ｱ":551,"ｸﾞ":1319,"ｽ":874,"ﾄ":521,"ﾑ":1109,"ﾙ":1591,"ﾛ":2201,"ﾝ":278};
this.UW4__ = {",":3930,".":3508,"―":-4841,"、":3930,"。":3508,"〇":4999,"「":1895,"」":3798,"〓":-5156,"あ":4752,"い":-3435,"う":-640,"え":-2514,"お":2405,"か":530,"が":6006,"き":-4482,"ぎ":-3821,"く":-3788,"け":-4376,"げ":-4734,"こ":2255,"ご":1979,"さ":2864,"し":-843,"じ":-2506,"す":-731,"ず":1251,"せ":181,"そ":4091,"た":5034,"だ":5408,"ち":-3654,"っ":-5882,"つ":-1659,"て":3994,"で":7410,"と":4547,"な":5433,"に":6499,"ぬ":1853,"ね":1413,"の":7396,"は":8578,"ば":1940,"ひ":4249,"び":-4134,"ふ":1345,"へ":6665,"べ":-744,"ほ":1464,"ま":1051,"み":-2082,"む":-882,"め":-5046,"も":4169,"ゃ":-2666,"や":2795,"ょ":-1544,"よ":3351,"ら":-2922,"り":-9726,"る":-14896,"れ":-2613,"ろ":-4570,"わ":-1783,"を":13150,"ん":-2352,"カ":2145,"コ":1789,"セ":1287,"ッ":-724,"ト":-403,"メ":-1635,"ラ":-881,"リ":-541,"ル":-856,"ン":-3637,"・":-4371,"ー":-11870,"一":-2069,"中":2210,"予":782,"事":-190,"井":-1768,"人":1036,"以":544,"会":950,"体":-1286,"作":530,"側":4292,"先":601,"党":-2006,"共":-1212,"内":584,"円":788,"初":1347,"前":1623,"副":3879,"力":-302,"動":-740,"務":-2715,"化":776,"区":4517,"協":1013,"参":1555,"合":-1834,"和":-681,"員":-910,"器":-851,"回":1500,"国":-619,"園":-1200,"地":866,"場":-1410,"塁":-2094,"士":-1413,"多":1067,"大":571,"子":-4802,"学":-1397,"定":-1057,"寺":-809,"小":1910,"屋":-1328,"山":-1500,"島":-2056,"川":-2667,"市":2771,"年":374,"庁":-4556,"後":456,"性":553,"感":916,"所":-1566,"支":856,"改":787,"政":2182,"教":704,"文":522,"方":-856,"日":1798,"時":1829,"最":845,"月":-9066,"木":-485,"来":-442,"校":-360,"業":-1043,"氏":5388,"民":-2716,"気":-910,"沢":-939,"済":-543,"物":-735,"率":672,"球":-1267,"生":-1286,"産":-1101,"田":-2900,"町":1826,"的":2586,"目":922,"省":-3485,"県":2997,"空":-867,"立":-2112,"第":788,"米":2937,"系":786,"約":2171,"経":1146,"統":-1169,"総":940,"線":-994,"署":749,"者":2145,"能":-730,"般":-852,"行":-792,"規":792,"警":-1184,"議":-244,"谷":-1000,"賞":730,"車":-1481,"軍":1158,"輪":-1433,"込":-3370,"近":929,"道":-1291,"選":2596,"郎":-4866,"都":1192,"野":-1100,"銀":-2213,"長":357,"間":-2344,"院":-2297,"際":-2604,"電":-878,"領":-1659,"題":-792,"館":-1984,"首":1749,"高":2120,"｢":1895,"｣":3798,"･":-4371,"ｯ":-724,"ｰ":-11870,"ｶ":2145,"ｺ":1789,"ｾ":1287,"ﾄ":-403,"ﾒ":-1635,"ﾗ":-881,"ﾘ":-541,"ﾙ":-856,"ﾝ":-3637};
this.UW5__ = {",":465,".":-299,"1":-514,"E2":-32768,"]":-2762,"、":465,"。":-299,"「":363,"あ":1655,"い":331,"う":-503,"え":1199,"お":527,"か":647,"が":-421,"き":1624,"ぎ":1971,"く":312,"げ":-983,"さ":-1537,"し":-1371,"す":-852,"だ":-1186,"ち":1093,"っ":52,"つ":921,"て":-18,"で":-850,"と":-127,"ど":1682,"な":-787,"に":-1224,"の":-635,"は":-578,"べ":1001,"み":502,"め":865,"ゃ":3350,"ょ":854,"り":-208,"る":429,"れ":504,"わ":419,"を":-1264,"ん":327,"イ":241,"ル":451,"ン":-343,"中":-871,"京":722,"会":-1153,"党":-654,"務":3519,"区":-901,"告":848,"員":2104,"大":-1296,"学":-548,"定":1785,"嵐":-1304,"市":-2991,"席":921,"年":1763,"思":872,"所":-814,"挙":1618,"新":-1682,"日":218,"月":-4353,"査":932,"格":1356,"機":-1508,"氏":-1347,"田":240,"町":-3912,"的":-3149,"相":1319,"省":-1052,"県":-4003,"研":-997,"社":-278,"空":-813,"統":1955,"者":-2233,"表":663,"語":-1073,"議":1219,"選":-1018,"郎":-368,"長":786,"間":1191,"題":2368,"館":-689,"１":-514,"Ｅ２":-32768,"｢":363,"ｲ":241,"ﾙ":451,"ﾝ":-343};
this.UW6__ = {",":227,".":808,"1":-270,"E1":306,"、":227,"。":808,"あ":-307,"う":189,"か":241,"が":-73,"く":-121,"こ":-200,"じ":1782,"す":383,"た":-428,"っ":573,"て":-1014,"で":101,"と":-105,"な":-253,"に":-149,"の":-417,"は":-236,"も":-206,"り":187,"る":-135,"を":195,"ル":-673,"ン":-496,"一":-277,"中":201,"件":-800,"会":624,"前":302,"区":1792,"員":-1212,"委":798,"学":-960,"市":887,"広":-695,"後":535,"業":-697,"相":753,"社":-507,"福":974,"空":-822,"者":1811,"連":463,"郎":1082,"１":-270,"Ｅ１":306,"ﾙ":-673,"ﾝ":-496};
return this;
}
TinySegmenter.prototype.ctype_ = function(str) {
for (var i in this.chartype_) {
if (str.match(this.chartype_[i][0])) {
return this.chartype_[i][1];
}
}
return "O";
}
TinySegmenter.prototype.ts_ = function(v) {
if (v) { return v; }
return 0;
}
TinySegmenter.prototype.segment = function(input) {
if (input == null || input == undefined || input == "") {
return [];
}
var result = [];
var seg = ["B3","B2","B1"];
var ctype = ["O","O","O"];
var o = input.split("");
for (i = 0; i < o.length; ++i) {
seg.push(o[i]);
ctype.push(this.ctype_(o[i]))
}
seg.push("E1");
seg.push("E2");
seg.push("E3");
ctype.push("O");
ctype.push("O");
ctype.push("O");
var word = seg[3];
var p1 = "U";
var p2 = "U";
var p3 = "U";
for (var i = 4; i < seg.length - 3; ++i) {
var score = this.BIAS__;
var w1 = seg[i-3];
var w2 = seg[i-2];
var w3 = seg[i-1];
var w4 = seg[i];
var w5 = seg[i+1];
var w6 = seg[i+2];
var c1 = ctype[i-3];
var c2 = ctype[i-2];
var c3 = ctype[i-1];
var c4 = ctype[i];
var c5 = ctype[i+1];
var c6 = ctype[i+2];
score += this.ts_(this.UP1__[p1]);
score += this.ts_(this.UP2__[p2]);
score += this.ts_(this.UP3__[p3]);
score += this.ts_(this.BP1__[p1 + p2]);
score += this.ts_(this.BP2__[p2 + p3]);
score += this.ts_(this.UW1__[w1]);
score += this.ts_(this.UW2__[w2]);
score += this.ts_(this.UW3__[w3]);
score += this.ts_(this.UW4__[w4]);
score += this.ts_(this.UW5__[w5]);
score += this.ts_(this.UW6__[w6]);
score += this.ts_(this.BW1__[w2 + w3]);
score += this.ts_(this.BW2__[w3 + w4]);
score += this.ts_(this.BW3__[w4 + w5]);
score += this.ts_(this.TW1__[w1 + w2 + w3]);
score += this.ts_(this.TW2__[w2 + w3 + w4]);
score += this.ts_(this.TW3__[w3 + w4 + w5]);
score += this.ts_(this.TW4__[w4 + w5 + w6]);
score += this.ts_(this.UC1__[c1]);
score += this.ts_(this.UC2__[c2]);
score += this.ts_(this.UC3__[c3]);
score += this.ts_(this.UC4__[c4]);
score += this.ts_(this.UC5__[c5]);
score += this.ts_(this.UC6__[c6]);
score += this.ts_(this.BC1__[c2 + c3]);
score += this.ts_(this.BC2__[c3 + c4]);
score += this.ts_(this.BC3__[c4 + c5]);
score += this.ts_(this.TC1__[c1 + c2 + c3]);
score += this.ts_(this.TC2__[c2 + c3 + c4]);
score += this.ts_(this.TC3__[c3 + c4 + c5]);
score += this.ts_(this.TC4__[c4 + c5 + c6]);
// score += this.ts_(this.TC5__[c4 + c5 + c6]);
score += this.ts_(this.UQ1__[p1 + c1]);
score += this.ts_(this.UQ2__[p2 + c2]);
score += this.ts_(this.UQ3__[p3 + c3]);
score += this.ts_(this.BQ1__[p2 + c2 + c3]);
score += this.ts_(this.BQ2__[p2 + c3 + c4]);
score += this.ts_(this.BQ3__[p3 + c2 + c3]);
score += this.ts_(this.BQ4__[p3 + c3 + c4]);
score += this.ts_(this.TQ1__[p2 + c1 + c2 + c3]);
score += this.ts_(this.TQ2__[p2 + c2 + c3 + c4]);
score += this.ts_(this.TQ3__[p3 + c1 + c2 + c3]);
score += this.ts_(this.TQ4__[p3 + c2 + c3 + c4]);
var p = "O";
if (score > 0) {
result.push(word);
word = "";
p = "B";
}
p1 = p2;
p2 = p3;
p3 = p;
word += seg[i];
}
result.push(word);
return result;
}
lunr.TinySegmenter = TinySegmenter;
};
}));

6708
v0.25.0/assets/javascripts/lunr/wordcut.js Normal file
View File

File diff suppressed because one or more lines are too long

42
v0.25.0/assets/javascripts/workers/search.6ce7567c.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

7
v0.25.0/assets/javascripts/workers/search.6ce7567c.min.js.map Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.25.0/assets/stylesheets/main.8c3ca2c6.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.25.0/assets/stylesheets/main.8c3ca2c6.min.css.map Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.25.0/assets/stylesheets/palette.06af60db.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.25.0/assets/stylesheets/palette.06af60db.min.css.map Normal file
View File

@ -0,0 +1 @@
{"version":3,"sources":["src/templates/assets/stylesheets/palette/_scheme.scss","../../../../src/templates/assets/stylesheets/palette.scss","src/templates/assets/stylesheets/palette/_accent.scss","src/templates/assets/stylesheets/palette/_primary.scss","src/templates/assets/stylesheets/utilities/_break.scss"],"names":[],"mappings":"AA2BA,cAGE,6BAME,sDAAA,CACA,6DAAA,CACA,+DAAA,CACA,gEAAA,CACA,mDAAA,CACA,6DAAA,CACA,+DAAA,CACA,gEAAA,CAGA,mDAAA,CACA,gDAAA,CAGA,0BAAA,CACA,mCAAA,CAGA,iCAAA,CACA,kCAAA,CACA,mCAAA,CACA,mCAAA,CACA,kCAAA,CACA,iCAAA,CACA,+CAAA,CACA,6DAAA,CACA,gEAAA,CACA,4DAAA,CACA,4DAAA,CACA,6DAAA,CAGA,6CAAA,CAGA,+CAAA,CAGA,uDAAA,CACA,6DAAA,CACA,2DAAA,CAGA,iCAAA,CAGA,yDAAA,CACA,iEAAA,CAGA,mDAAA,CACA,mDAAA,CAGA,qDAAA,CACA,uDAAA,CAGA,8DAAA,CAKA,8DAAA,CAKA,0DAAA,CAvEA,iBCeF,CD6DE,kHAEE,YC3DJ,CDkFE,yDACE,4BChFJ,CD+EE,2DACE,4BC7EJ,CD4EE,gEACE,4BC1EJ,CDyEE,2DACE,4BCvEJ,CDsEE,yDACE,4BCpEJ,CDmEE,0DACE,4BCjEJ,CDgEE,gEACE,4BC9DJ,CD6DE,0DACE,4BC3DJ,CD0DE,2OACE,4BC/CJ,CDsDA,+FAGE,iCCpDF,CACF,CC/CE,2BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCD2CN,CCrDE,4BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDkDN,CC5DE,8BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDyDN,CCnEE,mCACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDgEN,CC1EE,8BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDuEN,CCjFE,4BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCD8EN,CCxFE,kCACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDqFN,CC/FE,4BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCD4FN,CCtGE,4BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDmGN,CC7GE,6BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCD0GN,CCpHE,mCACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDiHN,CC3HE,4BACE,4BAAA,CACA,2CAAA,CAIE,8BAAA,CACA,qCD2HN,CClIE,8BACE,4BAAA,CACA,2CAAA,CAIE,8BAAA,CACA,qCDkIN,CCzIE,6BACE,yBAAA,CACA,2CAAA,CAIE,8BAAA,CACA,qCDyIN,CChJE,8BACE,4BAAA,CACA,2CAAA,CAIE,8BAAA,CACA,qCDgJN,CCvJE,mCACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDoJN,CEzJE,4BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsJN,CEjKE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8JN,CEzKE,+BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsKN,CEjLE,oCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8KN,CEzLE,+BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsLN,CEjME,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8LN,CEzME,mCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsMN,CEjNE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8MN,CEzNE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsNN,CEjOE,8BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8NN,CEzOE,oCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsON,CEjPE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAIE,+BAAA,CACA,sCFiPN,CEzPE,+BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAIE,+BAAA,CACA,sCFyPN,CEjQE,8BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAIE,+BAAA,CACA,sCFiQN,CEzQE,+BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAIE,+BAAA,CACA,sCFyQN,CEjRE,oCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8QN,CEzRE,8BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsRN,CEjSE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCAAA,CAKA,4BF0RN,CE1SE,kCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCAAA,CAKA,4BFmSN,CEpRE,sEACE,4BFuRJ,CExRE,+DACE,4BF2RJ,CE5RE,iEACE,4BF+RJ,CEhSE,gEACE,4BFmSJ,CEpSE,iEACE,4BFuSJ,CE9RA,8BACE,mDAAA,CACA,4DAAA,CACA,0DAAA,CACA,oDAAA,CACA,2DAAA,CAGA,4BF+RF,CE5RE,yCACE,+BF8RJ,CE3RI,kDAEE,0CAAA,CACA,sCAAA,CAFA,mCF+RN,CG3MI,mCD1EA,+CACE,8CFwRJ,CErRI,qDACE,8CFuRN,CElRE,iEACE,mCFoRJ,CACF,CGtNI,sCDvDA,uCACE,oCFgRJ,CACF,CEvQA,8BACE,kDAAA,CACA,4DAAA,CACA,wDAAA,CACA,oDAAA,CACA,6DAAA,CAGA,4BFwQF,CErQE,yCACE,+BFuQJ,CEpQI,kDAEE,0CAAA,CACA,sCAAA,CAFA,mCFwQN,CEjQE,yCACE,6CFmQJ,CG5NI,0CDhCA,8CACE,gDF+PJ,CACF,CGjOI,0CDvBA,iFACE,6CF2PJ,CACF,CGzPI,sCDKA,uCACE,6CFuPJ,CACF","file":"palette.css"}

1869
v0.25.0/bookmarks/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

14
v0.25.0/branches/index.html Normal file
View File

@ -0,0 +1,14 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Redirecting...</title>
<link rel="canonical" href="../bookmarks/">
<script>var anchor=window.location.hash.substr(1);location.href="../bookmarks/"+(anchor?"#"+anchor:"")</script>
<meta http-equiv="refresh" content="0; url=../bookmarks/">
</head>
<body>
You're being redirected to a <a href="../bookmarks/">new destination</a>.
</body>
</html>

8309
v0.25.0/cli-reference/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

1746
v0.25.0/code-of-conduct/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

1640
v0.25.0/community_tools/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

33
v0.25.0/config.toml Normal file
View File

@ -0,0 +1,33 @@
# Basic template of config settings
# Don't forget to change these to your own details!
user.name = "YOUR NAME"
user.email = "YOUR_EMAIL@example.com"
ui.color = "auto" # the default
# ui.color = never # no color
ui.editor = "pico" # the default on Unix
# ui.editor = "vim"
ui.diff-editor = ":builtin" # default, internal TUI tool
# ui.diff-editor = "meld"
# ui.diff-editor = "vimdiff"
ui.merge-editor = "meld" # default
# ui.merge-editor = "vscode"
# ui.merge-editor = "vimdiff"
# ui.merge-editor = "kdiff3"
# Relative timestamp rendered as "x days/hours/seconds ago"
template-aliases.'format_timestamp(timestamp)' = 'timestamp.ago()'
# The four merge tools listed above are pre-configured. For detailed information
# about how to change the default configuration or how to configure another tool,
# see documentation in config.md. An example:
# merge-tools.meld.program = "C:\\Program Files\\Meld\\meld.exe" # If not in PATH
# Change the default push/fetch remote for `jj git push` and `jj git fetch`
# git.fetch = "upstream"
# git.push = "myfork"

3631
v0.25.0/config/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

1683
v0.25.0/conflicts/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

2299
v0.25.0/contributing/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

2058
v0.25.0/design/copy-tracking/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

1837
v0.25.0/design/git-submodule-storage/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

1960
v0.25.0/design/git-submodules/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

2021
v0.25.0/design/run/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

1966
v0.25.0/design/sparse-v2/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

2276
v0.25.0/design/tracking-branches/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More