forked from mirrors/jj
Deployed c783bbc
to prerelease with MkDocs 1.5.2 and mike 1.1.2
This commit is contained in:
parent
20425bf1e3
commit
b578021afd
3 changed files with 33 additions and 1 deletions
|
@ -380,6 +380,13 @@
|
||||||
Where is my commit, why is it not visible in jj log?
|
Where is my commit, why is it not visible in jj log?
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="md-nav__item">
|
||||||
|
<a href="#jj-is-said-to-record-the-working-after-jj-log-and-every-other-command-where-can-i-see-these-automatic-saves" class="md-nav__link">
|
||||||
|
jj is said to record the working after jj log and every other command. Where can I see these automatic "saves"?
|
||||||
|
</a>
|
||||||
|
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li class="md-nav__item">
|
<li class="md-nav__item">
|
||||||
|
@ -1157,6 +1164,13 @@
|
||||||
Where is my commit, why is it not visible in jj log?
|
Where is my commit, why is it not visible in jj log?
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="md-nav__item">
|
||||||
|
<a href="#jj-is-said-to-record-the-working-after-jj-log-and-every-other-command-where-can-i-see-these-automatic-saves" class="md-nav__link">
|
||||||
|
jj is said to record the working after jj log and every other command. Where can I see these automatic "saves"?
|
||||||
|
</a>
|
||||||
|
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li class="md-nav__item">
|
<li class="md-nav__item">
|
||||||
|
@ -1255,6 +1269,24 @@ with <code>jj rebase</code>, <code>jj describe</code>, etc). In that case, <code
|
||||||
should show the revision as "hidden". <code>jj new commit_id</code> should make the
|
should show the revision as "hidden". <code>jj new commit_id</code> should make the
|
||||||
revision visible again.</p>
|
revision visible again.</p>
|
||||||
<p>See <a href="../revsets/">revsets</a> and <a href="../templates/">templates</a> for further guidance.</p>
|
<p>See <a href="../revsets/">revsets</a> and <a href="../templates/">templates</a> for further guidance.</p>
|
||||||
|
<h3 id="jj-is-said-to-record-the-working-after-jj-log-and-every-other-command-where-can-i-see-these-automatic-saves"><code>jj</code> is said to record the working after <code>jj log</code> and every other command. Where can I see these automatic "saves"?<a class="headerlink" href="#jj-is-said-to-record-the-working-after-jj-log-and-every-other-command-where-can-i-see-these-automatic-saves" title="Permanent link">¶</a></h3>
|
||||||
|
<p>Indeed, every <code>jj</code> command updates the current "working-copy" revision, marked
|
||||||
|
with <code>@</code> in <code>jj log</code>. You can notice this by how the <a href="../glossary/#commit-id">commit ID</a> of the
|
||||||
|
working copy revision changes when it's updated. Note that, unless you move to
|
||||||
|
another revision (with <code>jj new</code> or <code>jj edit</code>, for example), the <a href="../glossary/#change-id">change ID</a> will
|
||||||
|
not change.</p>
|
||||||
|
<p>If you expected to see a historical view of your working-copy changes in
|
||||||
|
<code>jj log</code>, as a chain in a parent-child relationship, this is not the case.
|
||||||
|
Instead, each commit gets amended and the commit ID changes.</p>
|
||||||
|
<p>You can see the history of these changes using <code>jj obslog</code>. This will show the
|
||||||
|
history of the commits that were previously the "working-copy commit", since
|
||||||
|
the last time the change id of the working copy commit changed. The obsolete
|
||||||
|
changes will be marked as "hidden". They are still accessible with any <code>jj</code>
|
||||||
|
command (<code>jj diff</code>, for example), but you will need to use the commit id to
|
||||||
|
refer to hidden commits.</p>
|
||||||
|
<p>You can also use <code>jj obslog -r</code> on revisions that were previously the
|
||||||
|
working-copy revisions. Use <code>jj obslog -p</code> as an easy way to see a commit's
|
||||||
|
evolution.</p>
|
||||||
<h3 id="can-i-prevent-jujutsu-from-recording-my-unfinished-work-im-not-ready-to-commit-it">Can I prevent Jujutsu from recording my unfinished work? I'm not ready to commit it.<a class="headerlink" href="#can-i-prevent-jujutsu-from-recording-my-unfinished-work-im-not-ready-to-commit-it" title="Permanent link">¶</a></h3>
|
<h3 id="can-i-prevent-jujutsu-from-recording-my-unfinished-work-im-not-ready-to-commit-it">Can I prevent Jujutsu from recording my unfinished work? I'm not ready to commit it.<a class="headerlink" href="#can-i-prevent-jujutsu-from-recording-my-unfinished-work-im-not-ready-to-commit-it" title="Permanent link">¶</a></h3>
|
||||||
<p>Jujutsu automatically records new files in the current working-copy commit and
|
<p>Jujutsu automatically records new files in the current working-copy commit and
|
||||||
doesn't provide a way to prevent that.</p>
|
doesn't provide a way to prevent that.</p>
|
||||||
|
|
File diff suppressed because one or more lines are too long
Binary file not shown.
Loading…
Reference in a new issue