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

Deployed de022ae to prerelease with MkDocs 1.6.0 and mike 2.1.1

Browse source
This commit is contained in:
jj-docs[bot] 2024-06-20 21:30:21 +00:00
parent 0185b51180
commit 67973f9541
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
prerelease/cli-reference/index.html
View file

@ -6491,6 +6491,7 @@ implied.</p>
<h6 id="options_26"><strong>Options:</strong><a class="headerlink" href="#options_26" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-e</code>, <code>--edit</code> — Instead of creating a new working-copy commit on top of the target commit (like <code>jj new</code>), edit the target commit directly (like <code>jj edit</code>)</li>
<li><code>--conflict</code> — Jump to the next conflicted descendant</li>
</ul>
<h2 id="jj-obslog"><code>jj obslog</code><a class="headerlink" href="#jj-obslog" title="Permanent link">&para;</a></h2>
<p>Show how a change has evolved over time</p>
@ -6682,6 +6683,7 @@ implied.</p>
<h6 id="options_31"><strong>Options:</strong><a class="headerlink" href="#options_31" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-e</code>, <code>--edit</code> — Edit the parent directly, instead of moving the working-copy commit</li>
<li><code>--conflict</code> — Jump to the previous conflicted ancestor</li>
</ul>
<h2 id="jj-rebase"><code>jj rebase</code><a class="headerlink" href="#jj-rebase" title="Permanent link">&para;</a></h2>
<p>Move revisions to different parent(s)</p>

2
prerelease/search/search_index.json
View file

File diff suppressed because one or more lines are too long