Skip to content

Commit

Permalink
Deployed 77eaf67 to prerelease with MkDocs 1.5.3 and mike 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jj-docs[bot] committed Apr 20, 2024
1 parent 2cb249b commit 8124d20
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 13 deletions.
22 changes: 10 additions & 12 deletions prerelease/config/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2445,18 +2445,16 @@ <h3 id="author-format">Author format<a class="headerlink" href="#author-format"
<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>
<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, and
each of these may resolve to one-or-many revisions. By default, <code>jj</code> will not
allow revsets that resolve to more than one revision &mdash; a so-called "large
revset" &mdash; and will ask you to confirm that you want to proceed by
prefixing it with the <code>all:</code> modifier.</p>
<p>For instance, to add a new parent <code>abc</code> to the commit <code>xyz</code>, you may use <code>jj
rebase</code>:</p>
<div class="highlight"><pre><span></span><code>jj rebase -r xyz -d &quot;all:xyz-&quot; -d &quot;abc&quot;
</code></pre></div>
<p><code>jj</code> requires the <code>all:</code> prefix for the above command. However, you may disable
this behavior by setting <code>ui.always-allow-large-revsets</code> to <code>true</code>:</p>
<div class="highlight"><pre><span></span><code><span class="n">ui</span><span class="p">.</span><span class="n">always-allow-large-revsets</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">true</span>
<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.
This restriction can be overridden by prefixing a revset that the user wants to
be able to expand to more than one revision with the <a href="../revsets/#the-all-modifier"><code>all:</code>
modifier</a>.</p>
<p>Another way you can override this check is by setting
<code>ui.always-allow-large-revsets</code> to <code>true</code>. Then, <code>jj</code> will allow every one of
the revset arguments of such commands to expand to any number of revisions.</p>
<div class="highlight"><pre><span></span><code><span class="c1"># Assume `all:` prefix before revsets whenever it would make a difference</span>
<span class="n">ui</span><span class="p">.</span><span class="n">always-allow-large-revsets</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">true</span>
</code></pre></div>
<h2 id="pager">Pager<a class="headerlink" href="#pager" title="Permanent link">&para;</a></h2>
<p>The default pager is can be set via <code>ui.pager</code> or the <code>PAGER</code> environment
Expand Down
42 changes: 42 additions & 0 deletions prerelease/revsets/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,15 @@
</ul>
</nav>

</li>

<li class="md-nav__item">
<a href="#the-all-modifier" class="md-nav__link">
<span class="md-ellipsis">
The all: modifier
</span>
</a>

</li>

<li class="md-nav__item">
Expand Down Expand Up @@ -1416,6 +1425,15 @@
</ul>
</nav>

</li>

<li class="md-nav__item">
<a href="#the-all-modifier" class="md-nav__link">
<span class="md-ellipsis">
The all: modifier
</span>
</a>

</li>

<li class="md-nav__item">
Expand Down Expand Up @@ -1665,6 +1683,30 @@ <h3 id="built-in-aliases">Built-in Aliases<a class="headerlink" href="#built-in-
<a href="../config/#set-of-immutable-commits">here</a> for details.</p>
</li>
</ul>
<h2 id="the-all-modifier">The <code>all:</code> modifier<a class="headerlink" href="#the-all-modifier" title="Permanent link">&para;</a></h2>
<p>Certain commands (such as <code>jj rebase</code>) can take multiple revset arguments, and
each of these may resolve to one-or-many revisions. By default, <code>jj</code> will not
allow revsets that resolve to more than one revision &mdash; a so-called "large
revset" &mdash; and will ask you to confirm that you want to proceed by
prefixing it with the <code>all:</code> modifier.</p>
<p>If you set the <code>ui.always-allow-large-revsets</code> option to <code>true</code>, <code>jj</code> will
behave as though the <code>all:</code> modifier was used every time it would matter.</p>
<p>An <code>all:</code> modifier before a revset expression does not otherwise change its
meaning. Strictly speaking, it is not part of the revset language. The notation
is similar to the modifiers like <code>glob:</code> allowed before <a href="#string-patterns">string
patterms</a>.</p>
<p>For example, <code>jj rebase -r w -d xyz+</code> will rebase <code>w</code> on top of the child of
<code>xyz</code> as long as <code>xyz</code> has exactly one child.</p>
<p>If <code>xyz</code> has more than one child, the <code>all:</code> modifier is <em>not</em> specified, and
<code>ui.always-allow-large-revsets</code> is <code>false</code> (the default), <code>jj rebase -r w -d
xyz+</code> will return an error.</p>
<p>If <code>ui.always-allow-large-revsets</code> was <code>true</code>, the above command would act as if
<code>all:</code> was set (see the next paragraph).</p>
<p>With the <code>all:</code> modifier, <code>jj rebase -r w -d all:xyz+</code> will make <code>w</code> into a merge
commit if <code>xyz</code> has more than one child. The <code>all:</code> modifier confirms that the
user expected <code>xyz</code> to have more than one child.</p>
<p>A more useful example: if <code>w</code> is a merge commit, <code>jj rebase -s w -d all:w- -d
xyz</code> will add <code>xyz</code> to the list of <code>w</code>'s parents.</p>
<h2 id="examples">Examples<a class="headerlink" href="#examples" title="Permanent link">&para;</a></h2>
<p>Show the parent(s) of the working-copy commit (like <code>git log -1 HEAD</code>):</p>
<div class="highlight"><pre><span></span><code>jj log -r @-
Expand Down
2 changes: 1 addition & 1 deletion prerelease/search/search_index.json

Large diffs are not rendered by default.

Binary file modified prerelease/sitemap.xml.gz
Binary file not shown.

0 comments on commit 8124d20

Please sign in to comment.