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

Deployed b212328 to prerelease with MkDocs 1.6.0 and mike 2.1.1

Browse source
This commit is contained in:
jj-docs[bot] 2024-08-06 18:27:45 +00:00
parent 260231f2eb
commit bbe6a32cda
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
prerelease/search/search_index.json
View file

File diff suppressed because one or more lines are too long

10
prerelease/tutorial/index.html
View file

@ -1470,6 +1470,11 @@
<h1 id="tutorial">Tutorial<a class="headerlink" href="#tutorial" title="Permanent link">&para;</a></h1>
<blockquote>
<p><strong>Hint:</strong> This tutorial has become somewhat out of date. Many people find
the alternative (not quite finished) <a href="https://steveklabnik.github.io/jujutsu-tutorial/">tutorial by Steve
Klabnik</a> helpful. </p>
</blockquote>
<p>This text assumes that the reader is familiar with Git.</p>
<h2 id="preparation">Preparation<a class="headerlink" href="#preparation" title="Permanent link">&para;</a></h2>
<p>If you haven't already, make sure you
@ -1608,6 +1613,11 @@ function in the revset matches it.</p>
ancestors (<code>::foo</code>), descendants (<code>foo::</code>), DAG range (<code>foo::bar</code>, like
<code>git log --ancestry-path</code>), range (<code>foo..bar</code>, same as Git's). See
<a href="../revsets/">the revset documentation</a> for all revset operators and functions.</p>
<blockquote>
<p><strong>Hint:</strong> If the default <code>jj log</code> omits some commits you expect to see, you
can always run <code>jj log -r ::</code> (or, equivalently, <code>jj log -r 'all()'</code>) to see
all the commits.</p>
</blockquote>
<h2 id="conflicts">Conflicts<a class="headerlink" href="#conflicts" title="Permanent link">&para;</a></h2>
<p>Now let's see how Jujutsu deals with merge conflicts. We'll start by making some
commits. We use <code>jj new</code> with the <code>--message</code>/<code>-m</code> option to set change