Update the v0.9.0 docs

This includes the changes in the `bafd1::233b31f` range which
all apply to version v0.9.0 and cherry-picked changes from 5fc71.

I don't plan to make any more update like these.

Automatic title:

Deployed 01dc2d1e to v0.9.0 with MkDocs 1.5.2 and mike 1.1.2
This commit is contained in:
Ilya Grigoriev 2023-09-07 17:12:11 -08:00
parent 2ca9a91c49
commit 170cd12b33
10 changed files with 49 additions and 62 deletions

View File

@ -1727,7 +1727,7 @@ the terminal width.</p>
</code></pre></div>
<p>To get shorter prefixes for certain revisions, set <code>revsets.short-prefixes</code>:</p>
<div class="highlight"><pre><span></span><code><span class="c1"># Prioritize the current branch</span>
<span class="n">revsets</span><span class="p">.</span><span class="n">short-prefixes</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">&quot;(main..@):&quot;</span>
<span class="n">revsets</span><span class="p">.</span><span class="n">short-prefixes</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">&quot;(main..@)::&quot;</span>
</code></pre></div>
<h3 id="relative-timestamps">Relative timestamps<a class="headerlink" href="#relative-timestamps" title="Permanent link">&para;</a></h3>
<p>Can be customized by the <code>format_timestamp()</code> template alias.</p>
@ -1776,7 +1776,7 @@ command will be executed directly. For example:</p>
<p>You can define aliases for commands, including their arguments. For example:</p>
<div class="highlight"><pre><span></span><code><span class="c1"># `jj l` shows commits on the working-copy commit&#39;s (anonymous) branch</span>
<span class="c1"># compared to the `main` branch</span>
<span class="n">aliases</span><span class="p">.</span><span class="n">l</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">[</span><span class="s">&quot;log&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;-r&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;(main..@): | (main..@)-&quot;</span><span class="p">]</span>
<span class="n">aliases</span><span class="p">.</span><span class="n">l</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">[</span><span class="s">&quot;log&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;-r&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;(main..@):: | (main..@)-&quot;</span><span class="p">]</span>
</code></pre></div>
<h2 id="editor">Editor<a class="headerlink" href="#editor" title="Permanent link">&para;</a></h2>
<p>The default editor is set via <code>ui.editor</code>, though there are several places to
@ -1850,7 +1850,7 @@ this file will be ignored. To suppress the creation of this file, set
<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
experience, you can follow these <a href="https://gist.github.com/ilyagr/5d6339fb7dac5e7ab06fe1561ec62d45">instructions</a> to configure
the [<code>DirDiff</code> Vim plugin] and/or the [<code>vimtabdiff</code> Python script].</p>
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>
<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
by <code>jj resolve</code>. For example:</p>
@ -1946,7 +1946,7 @@ with the following invocation:</p>
</code></pre></div>
<p>To configure the Watchman filesystem monitor, set
<code>core.fsmonitor = "watchman"</code>. Ensure that you have <a href="https://facebook.github.io/watchman/docs/install">installed the Watchman
executable on your system</a>).</p>
executable on your system</a>.</p>
<p>Debugging commands are available under <code>jj debug watchman</code>.</p>
<h1 id="user-config-file">User config file<a class="headerlink" href="#user-config-file" title="Permanent link">&para;</a></h1>
<p>On all platforms, the user's global <code>jj</code> configuration file is located at either

View File

@ -1305,7 +1305,8 @@ use GitHub pull requests for this purpose. Consult
information on using pull requests.</p>
<p>Unlike many GitHub projects (but like many VCS projects), we care more about the
contents of commits than about the contents of PRs. We review each commit
separately, and we don't squash them when the PR is ready.</p>
separately, and we don't squash-merge the PR (so please manually squash any
fixup commits before sending for review).</p>
<p>Each commit should ideally do one thing. For example, if you need to refactor a
function in order to add a new feature cleanly, put the refactoring in one
commit and the new feature in a different commit. If the refactoring itself

View File

@ -1331,7 +1331,7 @@ remote
Log all remote branches, which you authored or committed to
<code>jj log -r 'remote_branches() &amp; (mine() | committer(your@email.com))'</code>
Log all descendants of the current working copy, which aren't on a remote
<code>jj log -r ':@ &amp; ~remote_branches()'</code></p>
<code>jj log -r '::@ &amp; ~remote_branches()'</code></p>
<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
the <a href="tutorial.html#Conflicts">tutorial</a>.</p>

View File

@ -1371,36 +1371,22 @@ $<span class="w"> </span>jj<span class="w"> </span>config<span class="w"> </span
</code></pre></div>
<h2 id="command-line-completion">Command-line completion<a class="headerlink" href="#command-line-completion" title="Permanent link">&para;</a></h2>
<p>To set up command-line completion, source the output of
<code>jj util completion --bash/--zsh/--fish</code> (called <code>jj debug completion</code> in
jj &lt;= 0.7.0). Exactly how to source it depends on your shell.</p>
<code>jj util completion --bash/--zsh/--fish</code>. Exactly how to source it
depends on your shell.</p>
<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="o">)</span><span class="w"> </span><span class="c1"># --bash is the default</span>
</code></pre></div>
<p>Or, with jj &lt;= 0.7.0:</p>
<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>debug<span class="w"> </span>completion<span class="o">)</span><span class="w"> </span><span class="c1"># --bash is the default</span>
</code></pre></div>
<h3 id="zsh">Zsh<a class="headerlink" href="#zsh" title="Permanent link">&para;</a></h3>
<div class="highlight"><pre><span></span><code>autoload<span class="w"> </span>-U<span class="w"> </span>compinit
compinit
<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>--zsh<span class="o">)</span>
</code></pre></div>
<p>Or, with jj &lt;= 0.7.0:</p>
<div class="highlight"><pre><span></span><code>autoload<span class="w"> </span>-U<span class="w"> </span>compinit
compinit
<span class="nb">source</span><span class="w"> </span>&lt;<span class="o">(</span>jj<span class="w"> </span>debug<span class="w"> </span>completion<span class="w"> </span>--zsh<span class="o">)</span>
</code></pre></div>
<h3 id="fish">Fish<a class="headerlink" href="#fish" title="Permanent link">&para;</a></h3>
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>util<span class="w"> </span>completion<span class="w"> </span>--fish<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="nb">source</span>
</code></pre></div>
<p>Or, with jj &lt;= 0.7.0:</p>
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>debug<span class="w"> </span>completion<span class="w"> </span>--fish<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="nb">source</span>
</code></pre></div>
<h3 id="xonsh">Xonsh<a class="headerlink" href="#xonsh" title="Permanent link">&para;</a></h3>
<div class="highlight"><pre><span></span><code>source-bash<span class="w"> </span><span class="k">$(</span>jj<span class="w"> </span>util<span class="w"> </span>completion<span class="k">)</span>
</code></pre></div>
<p>Or, with jj &lt;= 0.7.0:</p>
<div class="highlight"><pre><span></span><code>source-bash<span class="w"> </span><span class="k">$(</span>jj<span class="w"> </span>debug<span class="w"> </span>completion<span class="k">)</span>
</code></pre></div>

View File

@ -1195,17 +1195,17 @@ only symbols.</p>
<li><code>~x</code>: Revisions that are not in <code>x</code>.</li>
<li><code>x-</code>: Parents of <code>x</code>.</li>
<li><code>x+</code>: Children of <code>x</code>.</li>
<li><code>:x</code>: Ancestors of <code>x</code>, including the commits in <code>x</code> itself.</li>
<li><code>x:</code>: Descendants of <code>x</code>, including the commits in <code>x</code> itself.</li>
<li><code>x:y</code>: Descendants of <code>x</code> that are also ancestors of <code>y</code>. Equivalent
to <code>x: &amp; :y</code>. This is what <code>git log</code> calls <code>--ancestry-path x..y</code>.</li>
<li><code>::x</code>, <code>x::</code>, and <code>x::y</code>: New versions of <code>:x</code>, <code>x:</code>, and <code>x:y</code> released in
jj 0.9.0. We plan to delete the latter in jj 0.15+.</li>
<li><code>::x</code>: Ancestors of <code>x</code>, including the commits in <code>x</code> itself.</li>
<li><code>x::</code>: Descendants of <code>x</code>, including the commits in <code>x</code> itself.</li>
<li><code>x::y</code>: Descendants of <code>x</code> that are also ancestors of <code>y</code>. Equivalent
to <code>x:: &amp; ::y</code>. This is what <code>git log</code> calls <code>--ancestry-path x..y</code>.</li>
<li><code>::</code>: All visible commits in the repo. Equivalent to <code>all()</code>.</li>
<li><code>:x</code>, <code>x:</code>, and <code>x:y</code>: Deprecated versions of <code>::x</code>, <code>x::</code>, and <code>x::y</code> We
plan to delete them in jj 0.15+.</li>
<li><code>x..y</code>: Ancestors of <code>y</code> that are not also ancestors of <code>x</code>. Equivalent to
<code>:y ~ :x</code>. This is what <code>git log</code> calls <code>x..y</code> (i.e. the same as we call it).</li>
<code>::y ~ ::x</code>. This is what <code>git log</code> calls <code>x..y</code> (i.e. the same as we call it).</li>
<li><code>..x</code>: Ancestors of <code>x</code>, including the commits in <code>x</code> itself, but excluding
the root commit. Equivalent to <code>:x ~ root()</code>.</li>
the root commit. Equivalent to <code>::x ~ root()</code>.</li>
<li><code>x..</code>: Revisions that are not ancestors of <code>x</code>.</li>
<li><code>..</code>: All visible commits in the repo, but excluding the root commit.
Equivalent to <code>~root()</code>.</li>
@ -1219,8 +1219,8 @@ revsets (expressions) as arguments.</p>
<li><code>parents(x)</code>: Same as <code>x-</code>.</li>
<li><code>children(x)</code>: Same as <code>x+</code>.</li>
<li><code>ancestors(x)</code>: Same as <code>:x</code>.</li>
<li><code>descendants(x)</code>: Same as <code>x:</code>.</li>
<li><code>connected(x)</code>: Same as <code>x:x</code>. Useful when <code>x</code> includes several commits.</li>
<li><code>descendants(x)</code>: Same as <code>x::</code>.</li>
<li><code>connected(x)</code>: Same as <code>x::x</code>. Useful when <code>x</code> includes several commits.</li>
<li><code>all()</code>: All visible commits in the repo.</li>
<li><code>none()</code>: No commits. This function is rarely useful; it is provided for
completeness.</li>
@ -1301,7 +1301,7 @@ combination of the predefined symbols/functions and other aliases.</p>
<div class="highlight"><pre><span></span><code>jj log -r &#39;remote_branches(remote=origin)..&#39;
</code></pre></div>
<p>Show all ancestors of the working copy (almost like plain <code>git log</code>)</p>
<div class="highlight"><pre><span></span><code>jj log -r :@
<div class="highlight"><pre><span></span><code>jj log -r ::@
</code></pre></div>
<p>Show the initial commits in the repo (the ones Git calls "root commits"):</p>
<div class="highlight"><pre><span></span><code>jj log -r root()+
@ -1311,7 +1311,7 @@ combination of the predefined symbols/functions and other aliases.</p>
</code></pre></div>
<p>Show local commits leading up to the working copy, as well as descendants of
those commits:</p>
<div class="highlight"><pre><span></span><code>jj log -r &#39;(remote_branches()..@):&#39;
<div class="highlight"><pre><span></span><code>jj log -r &#39;(remote_branches()..@)::&#39;
</code></pre></div>
<p>Show commits authored by "martinvonz" and containing the word "reset" in the
description:</p>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2,122 +2,122 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/FAQ.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/branches.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/code-of-conduct.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/config.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/conflicts.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/contributing.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/git-comparison.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/git-compatibility.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/github.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/glossary.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/install-and-setup.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/operation-log.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/related-work.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/revsets.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/sapling-comparison.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/templates.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/tutorial.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/working-copy.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/design/git-submodule-storage.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/design/git-submodules.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/design/tracking-branches.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/technical/architecture.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/technical/concurrency.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/v0.9.0/technical/conflicts.html</loc>
<lastmod>2023-09-06</lastmod>
<lastmod>2023-09-08</lastmod>
<changefreq>daily</changefreq>
</url>
</urlset>

Binary file not shown.

View File

@ -1272,7 +1272,7 @@ example:
called the "root commit". It's the root commit of every repo. The <code>root()</code>
function in the revset matches it.</p>
<p>There are also operators for getting the parents (<code>foo-</code>), children (<code>foo+</code>),
ancestors (<code>:foo</code>), descendants (<code>foo:</code>), DAG range (<code>foo:bar</code>, like
ancestors (<code>::foo</code>), descendants (<code>foo::</code>), DAG range (<code>foo::bar</code>, like
<code>git log --ancestry-path</code>), range (<code>foo..bar</code>, same as Git's). There are also a
few more functions, such as <code>heads(&lt;set&gt;)</code>, which filters out revisions in the
input set if they're ancestors of other revisions in the set.</p>
@ -1438,7 +1438,7 @@ $<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>-m
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>6f30cd1fb351<span class="w"> </span>ABC
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span>ABCD<span class="p">;</span><span class="w"> </span><span class="nb">printf</span><span class="w"> </span><span class="s1">&#39;A\nB\nC\nD\n&#39;</span><span class="w"> </span>&gt;<span class="w"> </span>file
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>a67491542e10<span class="w"> </span>ABCD
$<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span>-r<span class="w"> </span>master:@
$<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span>-r<span class="w"> </span>master::@
@<span class="w"> </span>mrxqplykzpkw<span class="w"> </span>martinvonz@google.com<span class="w"> </span><span class="m">2023</span>-02-12<span class="w"> </span><span class="m">19</span>:38:21.000<span class="w"> </span>-08:00<span class="w"> </span>b98c607bf87f
<span class="w"> </span>ABCD
<span class="w"> </span>kwtuwqnmqyqp<span class="w"> </span>martinvonz@google.com<span class="w"> </span><span class="m">2023</span>-02-12<span class="w"> </span><span class="m">19</span>:38:12.000<span class="w"> </span>-08:00<span class="w"> </span>30aecc0871ea