cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-30 19:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deployed 614b289 to prerelease with MkDocs 1.5.3 and mike 2.0.0

Browse Source
This commit is contained in:
jj-docs[bot] 2024-01-04 01:57:57 +00:00
parent 93abc7180f
commit fabe85f826
4 changed files with 64 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
prerelease/branches/index.html
View File

@ -456,8 +456,8 @@
<ul class="md-nav__list"> <ul class="md-nav__list">
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#what-does-gitauto-local-branch-actually-do" class="md-nav__link"> <a href="#what-does-gitauto-local-branch-true-actually-do" class="md-nav__link">
What does git.auto-local-branch actually do? What does git.auto-local-branch = true actually do?
</a> </a>
</li> </li>
@ -1141,8 +1141,8 @@
<ul class="md-nav__list"> <ul class="md-nav__list">
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#what-does-gitauto-local-branch-actually-do" class="md-nav__link"> <a href="#what-does-gitauto-local-branch-true-actually-do" class="md-nav__link">
What does git.auto-local-branch actually do? What does git.auto-local-branch = true actually do?
</a> </a>
</li> </li>
@ -1198,50 +1198,40 @@ pass a branch's name to commands that want a revision as argument. For example,
<code>jj branch list</code> to list branches and <code>jj branch</code> to create, move, or delete <code>jj branch list</code> to list branches and <code>jj branch</code> to create, move, or delete
branches. There is currently no concept of an active/current/checked-out branch.</p> branches. There is currently no concept of an active/current/checked-out branch.</p>
<h2 id="remotes">Remotes<a class="headerlink" href="#remotes" title="Permanent link">&para;</a></h2> <h2 id="remotes">Remotes<a class="headerlink" href="#remotes" title="Permanent link">&para;</a></h2>
<p>Jujutsu identifies a branch by its name across remotes (this is unlike Git and <p>Jujutsu records the last seen position on each remote (just like Git's
more like Mercurial's "bookmarks"). For example, a branch called "main" in your
local repo is considered the same branch as a branch by the same name on a
remote. When you pull from a remote (currently only via <code>jj git fetch</code>), any
branches from the remote will be imported as branches in your local repo.</p>
<p>Jujutsu also records the last seen position on each remote (just like Git's
remote-tracking branches). You can refer to these with remote-tracking branches). You can refer to these with
<code>&lt;branch name&gt;@&lt;remote name&gt;</code>, such as <code>jj new main@origin</code>. Most commands don't <code>&lt;branch name&gt;@&lt;remote name&gt;</code>, such as <code>jj new main@origin</code>.</p>
show the remote branch if it has the same target as the local branch. The local <p>A remote branch can be associated with a local branch of the same name. It's
branch (without <code>@&lt;remote name&gt;</code>) is considered the branch's desired target. sometimes called a tracking branch. When you pull from a remote, any changes
Consequently, if you want to update a branch on a remote, you first update the compared to the current record of the remote's state will be propagated to the
branch locally and then push the update to the remote. If a local branch also tracking local branch. Let's say you run <code>jj git fetch --remote origin</code> and the
exists on some remote but points to a different target there, <code>jj log</code> will remote's "main" branch has moved so its target is now ahead of the local record
show the branch name with an asterisk suffix (e.g. <code>main*</code>). That is meant to in <code>main@origin</code>. That will update <code>main@origin</code> to the new target. It will also
remind you that you may want to push the branch to some remote.</p> apply the change to the local branch <code>main</code>. If the local target had also moved
<p>When you pull from a remote, any changes compared to the current record of the compared to <code>main@origin</code> (probably because you had run <code>jj branch set main</code>),
remote's state will be propagated to the local branch. Let's say you run then the two updates will be merged. If one is ahead of the other, then that
<code>jj git fetch --remote origin</code> and the remote's "main" branch has moved so its target will be the new target. Otherwise, the local branch will be conflicted
target is now ahead of the local record in <code>main@origin</code>. That will update (see the next "Conflicts" section for details).</p>
<code>main@origin</code> to the new target. It will also apply the change to the local <p>Most commands don't show the tracking remote branch if it has the same target as
branch <code>main</code>. If the local target had also moved compared to <code>main@origin</code> the local branch. The local branch (without <code>@&lt;remote name&gt;</code>) is considered the
(probably because you had run <code>jj branch set main</code>), then the two updates will be branch's desired target. Consequently, if you want to update a branch on a
merged. If one is ahead of the other, then that target will be the new target. remote, you first update the branch locally and then push the update to the
Otherwise, the local branch will be conflicted (see next section for details).</p> remote. If a local branch also exists on some remote but points to a different
<!-- TODO: Adjust this paragraph to the new defaults which were introduced in #2736 --> target there, <code>jj log</code> will show the branch name with an asterisk suffix
<p>As of December 2023 Jujutsu tracks<sup id="fnref:1"><a class="footnote-ref" href="#fn:1">1</a></sup> and fetches all branches by default, (e.g. <code>main*</code>). That is meant to remind you that you may want to push the branch
which is confusing users coming from Git. To smoothen the transition branch to some remote.</p>
tracking was introduced. </p> <p>By default, the default remote branch (e.g. <code>main@origin</code>) will be tracked
<h3 id="what-does-gitauto-local-branch-actually-do">What does <code>git.auto-local-branch</code> actually do?<a class="headerlink" href="#what-does-gitauto-local-branch-actually-do" title="Permanent link">&para;</a></h3> automatically. You can use <code>jj branch track</code> to track existing remote branches
<p>Jujutsu's fetch operations consist of several steps. First <code>jj git fetch</code> individually, or set <code>git.auto-local-branch = true</code> configuration to track all
fetches all Git refs under <code>/refs/remotes/origin</code> (or, if you have new remote branches automatically.</p>
multiple remotes <code>/refs/remotes/&lt;remote name&gt;</code> for each remote).<br /> <h3 id="what-does-gitauto-local-branch-true-actually-do">What does <code>git.auto-local-branch = true</code> actually do?<a class="headerlink" href="#what-does-gitauto-local-branch-true-actually-do" title="Permanent link">&para;</a></h3>
Then Jujutsu stores these refs as remote tracking branches. Finally, by default, <p>Jujutsu's fetch operation consist of several steps. First <code>jj git fetch</code> fetches
Jujutsu creates local branches for them. This is similar to Mercurial, which all Git refs under <code>refs/remotes/&lt;remote name&gt;</code>. Then Jujutsu stores these refs
fetches all it's Booksmarks (equivalent to Git branches) by default. </p> as remote tracking branches. Finally, if <code>git.auto-local-branch = true</code>, Jujutsu
<p>There are two ways to disable the creation (or modification) of the local creates local branches for them. This is similar to Mercurial, which fetches all
branches by <code>jj git fetch</code>: </p> its bookmarks (equivalent to Git branches) by default.</p>
<ul> <p>You can use <code>jj branch untrack &lt;branch name&gt;@&lt;remote name&gt;</code> to stop tracking
<li>You can use <code>jj branch untrack &lt;branch-name&gt;@&lt;remote name&gt;</code> to stop tracking specific branches when fetching from specific remotes.</p>
specific branches when fetching from specific remotes. </li>
<li>You can set <code>git.auto-local-branch = false</code> to change the default behavior.
Then, Jujutsu will only create local branches for remote branches which you
explicitly track with <code>jj branch track&lt;branch name&gt;@&lt;remote name&gt;</code>.</li>
</ul>
<h3 id="tracking-a-branch">Tracking a branch<a class="headerlink" href="#tracking-a-branch" title="Permanent link">&para;</a></h3> <h3 id="tracking-a-branch">Tracking a branch<a class="headerlink" href="#tracking-a-branch" title="Permanent link">&para;</a></h3>
<p>To track a branch permanently use <code>jj branch track &lt;branch name&gt;@&lt;remote name&gt;</code>. <p>To track a branch permanently use <code>jj branch track &lt;branch name&gt;@&lt;remote name&gt;</code>.
It will now be imported as a local branch until you untrack it or it is deleted It will now be imported as a local branch until you untrack it or it is deleted
@ -1291,14 +1281,6 @@ on top of the other with <code>jj rebase</code>.</p>
<p>To resolve a conflicted state in a remote branch (e.g. <code>main@origin</code>), simply <p>To resolve a conflicted state in a remote branch (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 branch (which was presumably also conflicted).</p> propagate to the local branch (which was presumably also conflicted).</p>
<div class="footnote">
<hr />
<ol>
<li id="fn:1">
<p>Tracking in this context means if <code>jj</code> should create a local branch for a remote branch.&#160;<a class="footnote-backref" href="#fnref:1" title="Jump back to footnote 1 in the text">&#8617;</a></p>
</li>
</ol>
</div>

2
prerelease/search/search_index.json
View File

File diff suppressed because one or more lines are too long

52
prerelease/sitemap.xml
View File

@ -2,132 +2,132 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/</loc> <loc>https://martinvonz.github.io/jj/prerelease/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/FAQ/</loc> <loc>https://martinvonz.github.io/jj/prerelease/FAQ/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/branches/</loc> <loc>https://martinvonz.github.io/jj/prerelease/branches/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/code-of-conduct/</loc> <loc>https://martinvonz.github.io/jj/prerelease/code-of-conduct/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/config/</loc> <loc>https://martinvonz.github.io/jj/prerelease/config/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/conflicts/</loc> <loc>https://martinvonz.github.io/jj/prerelease/conflicts/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/contributing/</loc> <loc>https://martinvonz.github.io/jj/prerelease/contributing/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/git-comparison/</loc> <loc>https://martinvonz.github.io/jj/prerelease/git-comparison/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/git-compatibility/</loc> <loc>https://martinvonz.github.io/jj/prerelease/git-compatibility/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/github/</loc> <loc>https://martinvonz.github.io/jj/prerelease/github/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/glossary/</loc> <loc>https://martinvonz.github.io/jj/prerelease/glossary/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/install-and-setup/</loc> <loc>https://martinvonz.github.io/jj/prerelease/install-and-setup/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/operation-log/</loc> <loc>https://martinvonz.github.io/jj/prerelease/operation-log/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/related-work/</loc> <loc>https://martinvonz.github.io/jj/prerelease/related-work/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/revsets/</loc> <loc>https://martinvonz.github.io/jj/prerelease/revsets/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/sapling-comparison/</loc> <loc>https://martinvonz.github.io/jj/prerelease/sapling-comparison/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/templates/</loc> <loc>https://martinvonz.github.io/jj/prerelease/templates/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/tutorial/</loc> <loc>https://martinvonz.github.io/jj/prerelease/tutorial/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/working-copy/</loc> <loc>https://martinvonz.github.io/jj/prerelease/working-copy/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodule-storage/</loc> <loc>https://martinvonz.github.io/jj/prerelease/design/git-submodule-storage/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodules/</loc> <loc>https://martinvonz.github.io/jj/prerelease/design/git-submodules/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/design/run/</loc> <loc>https://martinvonz.github.io/jj/prerelease/design/run/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/design/tracking-branches/</loc> <loc>https://martinvonz.github.io/jj/prerelease/design/tracking-branches/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/architecture/</loc> <loc>https://martinvonz.github.io/jj/prerelease/technical/architecture/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/concurrency/</loc> <loc>https://martinvonz.github.io/jj/prerelease/technical/concurrency/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/conflicts/</loc> <loc>https://martinvonz.github.io/jj/prerelease/technical/conflicts/</loc>
<lastmod>2024-01-02</lastmod> <lastmod>2024-01-04</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
</urlset> </urlset>

BIN
prerelease/sitemap.xml.gz
View File

Binary file not shown.