mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-29 19:11:11 +00:00
Deployed 7b3f8e8 to prerelease with MkDocs 1.5.3 and mike 2.0.0
This commit is contained in:
parent
5aacc318fc
commit
0ca9d33dcd
@ -5599,6 +5599,10 @@ does not match the <code>jj help</code> output exactly.</p>
|
||||
<p><code>--color <WHEN></code> — When to colorize output (always, never, auto)</p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>--quiet</code> — Silence non-primary command output</p>
|
||||
<p>Possible values: <code>true</code>, <code>false</code></p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>--no-pager</code> — Disable the pager</p>
|
||||
<p>Possible values: <code>true</code>, <code>false</code></p>
|
||||
</li>
|
||||
@ -6679,10 +6683,6 @@ commit. This is true in general; it is not specific to this command.</p>
|
||||
<p>Possible values: <code>true</code>, <code>false</code></p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>-q</code>, <code>--quiet</code> — Do not print the list of remaining conflicts (if any) after resolving a conflict</p>
|
||||
<p>Possible values: <code>true</code>, <code>false</code></p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>--tool <NAME></code> — Specify 3-way merge tool to be used</p>
|
||||
</li>
|
||||
</ul>
|
||||
|
File diff suppressed because one or more lines are too long
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user