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

Deployed 60078e9 to prerelease with MkDocs 1.6.1 and mike 2.1.3

Browse Source
This commit is contained in:
jj-docs[bot] 2024-12-17 01:33:46 +00:00
parent 756dbf8921
commit 0fbb93a93d
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
prerelease/cli-reference/index.html
View File

@ -6452,7 +6452,13 @@ does not match the <code>jj help</code> output exactly.</p>
<li>
<p><code>--no-pager</code> — Disable the pager</p>
</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-toml &lt;TOML&gt;</code> — Additional configuration options (can be repeated)</p>
</li>
<li><code>--config-file &lt;PATH&gt;</code> — Additional configuration files (can be repeated)</li>
</ul>
<h2 id="jj-abandon"><code>jj abandon</code><a class="headerlink" href="#jj-abandon" title="Permanent link">&para;</a></h2>
@ -6758,7 +6764,10 @@ Martin von Zweigbergk</p>
<h6 id="arguments_14"><strong>Arguments:</strong><a class="headerlink" href="#arguments_14" title="Permanent link">&para;</a></h6>
<ul>
<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>
<h6 id="options_12"><strong>Options:</strong><a class="headerlink" href="#options_12" title="Permanent link">&para;</a></h6>
<ul>

15
prerelease/config/index.html
View File

@ -3486,14 +3486,15 @@ 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>
</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>
<p>You can use one or more <code>--config-toml</code>/<code>--config-file</code> options on the command
line to specify additional configuration settings. This overrides settings
defined in 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
<p>You can use one or more <code>--config</code>/<code>--config-toml</code>/<code>--config-file</code> options on
the command line to specify additional configuration settings. This overrides
settings defined in config files or environment variables. For example,</p>
<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-toml<span class="o">=</span><span class="s1">&#39;ui.diff-editor=&quot;kdiff3&quot;&#39;</span><span class="w"> </span>split
</code></pre></div>
<p>Config specified this way must be valid TOML. In particular, string values must
be surrounded by quotes. To pass these quotes to <code>jj</code>, most shells require
surrounding those quotes with single quotes as shown above.</p>
<p>Config specified by <code>--config-toml</code> must be valid TOML. In particular, string
values must be surrounded by quotes. To pass these quotes to <code>jj</code>, most shells
require surrounding those quotes with single quotes as shown above. On the other
hand, <code>--config</code> can accept a bare string value.</p>
<p>In <code>sh</code>-compatible shells, <code>--config-toml</code> can be used to merge entire TOML
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

2
prerelease/search/search_index.json
View File

File diff suppressed because one or more lines are too long