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

Deployed d047512 to prerelease with MkDocs 1.5.2 and mike 1.1.2

Browse source
This commit is contained in:
jj-docs-bot 2023-09-06 20:09:47 +00:00
parent f00e6eb4af
commit da076906a2
7 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
prerelease/config.html
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

2
prerelease/github.html
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>

24
prerelease/revsets.html
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>

2
prerelease/search/search_index.js
View file

File diff suppressed because one or more lines are too long

2
prerelease/search/search_index.json
View file

File diff suppressed because one or more lines are too long

BIN
prerelease/sitemap.xml.gz
View file

Binary file not shown.

4
prerelease/tutorial.html
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