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 25117d7 to prerelease with MkDocs 1.6.1 and mike 2.1.3

Browse Source
This commit is contained in:
jj-docs[bot] 2024-12-16 20:23:27 +00:00
parent dd068c7e3b
commit f25f81080b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prerelease/github/index.html
View File

@ -1838,8 +1838,8 @@ remote:</p>
<p>Log all remote bookmarks that you authored or committed to:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span>-r<span class="w"> </span><span class="s1">&#39;remote_bookmarks() &amp; (mine() | committer(your@email.com))&#39;</span>
</code></pre></div>
<p>Log all descendants of the current working copy that aren't on any remote:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span>-r<span class="w"> </span><span class="s1">&#39;::@ &amp; ~remote_bookmarks()&#39;</span>
<p>Log all ancestors of the current working copy that aren't on any remote:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span>-r<span class="w"> </span><span class="s1">&#39;remote_bookmarks()..@&#39;</span>
</code></pre></div>
<h2 id="merge-conflicts">Merge conflicts<a class="headerlink" href="#merge-conflicts" title="Permanent link">&para;</a></h2>
<p>For a detailed overview, how Jujutsu handles conflicts, revisit

2
prerelease/search/search_index.json
View File

File diff suppressed because one or more lines are too long