mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-29 02:51:12 +00:00
Deployed a83dadd to prerelease with MkDocs 1.6.0 and mike 2.1.1
This commit is contained in:
parent
7d020fe11d
commit
28c4c70161
@ -793,6 +793,21 @@
|
|||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
<nav class="md-nav" aria-label="Diff format">
|
||||||
|
<ul class="md-nav__list">
|
||||||
|
|
||||||
|
<li class="md-nav__item">
|
||||||
|
<a href="#color-words-diff-options" class="md-nav__link">
|
||||||
|
<span class="md-ellipsis">
|
||||||
|
Color-words diff options
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
</ul>
|
||||||
|
</nav>
|
||||||
|
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li class="md-nav__item">
|
<li class="md-nav__item">
|
||||||
@ -1969,6 +1984,21 @@
|
|||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
<nav class="md-nav" aria-label="Diff format">
|
||||||
|
<ul class="md-nav__list">
|
||||||
|
|
||||||
|
<li class="md-nav__item">
|
||||||
|
<a href="#color-words-diff-options" class="md-nav__link">
|
||||||
|
<span class="md-ellipsis">
|
||||||
|
Color-words diff options
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
</ul>
|
||||||
|
</nav>
|
||||||
|
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li class="md-nav__item">
|
<li class="md-nav__item">
|
||||||
@ -2578,6 +2608,28 @@ can override the default style with the following keys:</p>
|
|||||||
<div class="highlight"><pre><span></span><code><span class="c1"># Possible values: "color-words" (default), "git", "summary"</span>
|
<div class="highlight"><pre><span></span><code><span class="c1"># Possible values: "color-words" (default), "git", "summary"</span>
|
||||||
<span class="n">ui</span><span class="p">.</span><span class="n">diff</span><span class="p">.</span><span class="n">format</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"git"</span>
|
<span class="n">ui</span><span class="p">.</span><span class="n">diff</span><span class="p">.</span><span class="n">format</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"git"</span>
|
||||||
</code></pre></div>
|
</code></pre></div>
|
||||||
|
<h4 id="color-words-diff-options">Color-words diff options<a class="headerlink" href="#color-words-diff-options" title="Permanent link">¶</a></h4>
|
||||||
|
<p>In color-words diffs, changed words are displayed inline by default. Because
|
||||||
|
it's difficult to read a diff line with many removed/added words, there's a
|
||||||
|
threshold to switch to traditional separate-line format.</p>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
<p><code>max-inline-alternation</code>: Maximum number of removed/added word alternation to
|
||||||
|
inline. For example, <code><added> ... <added></code> sequence has 1 alternation, so the
|
||||||
|
line will be inline if <code>max-inline-alternation >= 1</code>. <code><added> ... <removed>
|
||||||
|
... <added></code> sequence has 3 alternation.</p>
|
||||||
|
<ul>
|
||||||
|
<li><code>0</code>: disable inlining, making <code>--color-words</code> more similar to <code>--git</code></li>
|
||||||
|
<li><code>1</code>: inline removes-only or adds-only lines</li>
|
||||||
|
<li><code>2</code>, <code>3</code>, ..: inline up to <code>2</code>, <code>3</code>, .. alternation</li>
|
||||||
|
<li><code>-1</code>: inline all lines (default)</li>
|
||||||
|
</ul>
|
||||||
|
<p><strong>This parameter is experimental.</strong> The definition is subject to change.</p>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<div class="highlight"><pre><span></span><code><span class="k">[diff.color-words]</span>
|
||||||
|
<span class="n">max-inline-alternation</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="mi">3</span>
|
||||||
|
</code></pre></div>
|
||||||
<h3 id="generating-diffs-by-external-command">Generating diffs by external command<a class="headerlink" href="#generating-diffs-by-external-command" title="Permanent link">¶</a></h3>
|
<h3 id="generating-diffs-by-external-command">Generating diffs by external command<a class="headerlink" href="#generating-diffs-by-external-command" title="Permanent link">¶</a></h3>
|
||||||
<p>If <code>ui.diff.tool</code> is set, the specified diff command will be called instead of
|
<p>If <code>ui.diff.tool</code> is set, the specified diff command will be called instead of
|
||||||
the internal diff function.</p>
|
the internal diff function.</p>
|
||||||
|
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user