Skip to content

Commit

Permalink
Deployed b212328 to prerelease with MkDocs 1.6.0 and mike 2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jj-docs[bot] committed Aug 6, 2024
1 parent 260231f commit bbe6a32
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion prerelease/search/search_index.json

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions prerelease/tutorial/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1608,6 +1613,11 @@ <h2 id="the-log-command-and-revsets">The log command and "revsets"<a class="head
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
Expand Down

0 comments on commit bbe6a32

Please sign in to comment.