mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-25 17:11:12 +00:00
Deployed 05c6d62 to prerelease with MkDocs 1.6.0 and mike 2.1.1
This commit is contained in:
parent
e7b1a6e61e
commit
27aa0f58d3
@ -666,6 +666,15 @@
|
|||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="md-nav__item">
|
||||||
|
<a href="#ease-of-use" class="md-nav__link">
|
||||||
|
<span class="md-ellipsis">
|
||||||
|
Ease of use
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
@ -1560,6 +1569,15 @@
|
|||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="md-nav__item">
|
||||||
|
<a href="#ease-of-use" class="md-nav__link">
|
||||||
|
<span class="md-ellipsis">
|
||||||
|
Ease of use
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
@ -1756,6 +1774,13 @@ want to rebase one side on top of the other with <code>jj rebase</code>.</p>
|
|||||||
<p>To resolve a conflicted state in a remote bookmark (e.g. <code>main@origin</code>), simply
|
<p>To resolve a conflicted state in a remote bookmark (e.g. <code>main@origin</code>), simply
|
||||||
pull from the remote (e.g. <code>jj git fetch</code>). The conflict resolution will also
|
pull from the remote (e.g. <code>jj git fetch</code>). The conflict resolution will also
|
||||||
propagate to the local bookmark (which was presumably also conflicted).</p>
|
propagate to the local bookmark (which was presumably also conflicted).</p>
|
||||||
|
<h2 id="ease-of-use">Ease of use<a class="headerlink" href="#ease-of-use" title="Permanent link">¶</a></h2>
|
||||||
|
<p>The use of bookmarks is frequent in some workflows, for example, when
|
||||||
|
interacting with Git repositories containing branches. To this end,
|
||||||
|
one-letter shortcuts have been implemented, both for the <code>jj bookmark</code>
|
||||||
|
command itself through an alias (as <code>jj b</code>), and for its subcommands.
|
||||||
|
For example, <code>jj bookmark create BOOKMARK-NAME</code> can be abbreviated as
|
||||||
|
<code>jj b c BOOKMARK-NAME</code>.</p>
|
||||||
<div class="footnote">
|
<div class="footnote">
|
||||||
<hr />
|
<hr />
|
||||||
<ol>
|
<ol>
|
||||||
|
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user