cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-31 23:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deployed e415c09 to prerelease with MkDocs 1.6.1 and mike 2.1.3

Browse Source
This commit is contained in:
jj-docs[bot] 2024-10-15 22:50:35 +00:00
parent 6da16942ea
commit 50d46b4dd2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
prerelease/FAQ/index.html
View File

@ -1849,8 +1849,9 @@ $<span class="w"> </span>jj<span class="w"> </span>log
<li>The private commit <em>wwwwwwww</em> is the second parent of the merge commit.</li>
<li>The working copy (<em>vvvvvvvv</em>) contains changes from both.</li>
</ul>
<p>As you work, squash your changes using <code>jj squash --into xxxxxxxx</code>. Or, you can
keep your changes in a separate commit and remove <em>ttsqqnrx</em> as a parent:</p>
<p>As you work, squash your changes using <code>jj squash --into xxxxxxxx</code>. Or you can
keep your changes in a separate commit without the private commit <em>wwwwwwww</em> as a
parent:</p>
<div class="highlight"><pre><span></span><code><span class="c1"># Remove the private commit as a parent</span>
$<span class="w"> </span>jj<span class="w"> </span>rebase<span class="w"> </span>-r<span class="w"> </span>vvvvvvvv<span class="w"> </span>-d<span class="w"> </span>xxxxxxxx

2
prerelease/search/search_index.json
View File

File diff suppressed because one or more lines are too long