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

Browse Source
This commit is contained in:
jj-docs[bot] 2025-01-19 20:31:05 +00:00
parent dc343bfa0a
commit fb1e60f99f
5 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prerelease/FAQ/index.html
View File

@ -1980,7 +1980,7 @@ commit you want to restore the contents to. Let's say the current commit (with
the changes intended for a new commit) are in commit X and the state you wanted
is in commit Y. Note the commit id (normally in blue at the end of the line in
the log output) of each of them. Now use <code>jj new</code> to create a new working-copy
commit, then run <code>jj restore --from Y --to @-</code> to restore the parent commit
commit, then run <code>jj restore --from Y --into @-</code> to restore the parent commit
to the old state, and <code>jj restore --from X</code> to restore the new working-copy
commit to the new state.</p>
<h3 id="how-do-i-resume-working-on-an-existing-change">How do I resume working on an existing change?<a class="headerlink" href="#how-do-i-resume-working-on-an-existing-change" title="Permanent link">&para;</a></h3>

4
prerelease/cli-reference/index.html
View File

@ -7916,10 +7916,10 @@ commit. This is true in general; it is not specific to this command.</p>
<h6 id="options_41"><strong>Options:</strong><a class="headerlink" href="#options_41" title="Permanent link">&para;</a></h6>
<ul>
<li><code>-f</code>, <code>--from &lt;REVSET&gt;</code> — Revision to restore from (source)</li>
<li><code>-t</code>, <code>--to &lt;REVSETS&gt;</code> — Revision to restore into (destination)</li>
<li><code>-t</code>, <code>--into &lt;REVSETS&gt;</code> — Revision to restore into (destination)</li>
<li>
<p><code>-c</code>, <code>--changes-in &lt;REVSET&gt;</code> — Undo the changes in a revision as compared to the merge of its parents.</p>
<p>This undoes the changes that can be seen with <code>jj diff -r REVSET</code>. If <code>REVSET</code> only has a single parent, this option is equivalent to <code>jj restore --to REVSET --from REVSET-</code>.</p>
<p>This undoes the changes that can be seen with <code>jj diff -r REVSET</code>. If <code>REVSET</code> only has a single parent, this option is equivalent to <code>jj restore --into REVSET --from REVSET-</code>.</p>
<p>The default behavior of <code>jj restore</code> is equivalent to <code>jj restore --changes-in @</code>.</p>
</li>
<li>

2
prerelease/search/search_index.json
View File

File diff suppressed because one or more lines are too long

74
prerelease/sitemap.xml
View File

@ -2,150 +2,150 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://jj-vcs.github.io/jj/latest/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/FAQ/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/bookmarks/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/cli-reference/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/code-of-conduct/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/community_tools/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/config/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/conflicts/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/contributing/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/design_doc_blueprint/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/design_docs/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/filesets/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/git-comparison/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/git-compatibility/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/github/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/glossary/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/install-and-setup/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/operation-log/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/related-work/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/revsets/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/roadmap/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/sapling-comparison/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/templates/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/testimonials/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/tutorial/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/windows/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/working-copy/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/design/copy-tracking/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/design/git-submodule-storage/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/design/git-submodules/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/design/run/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/design/sparse-v2/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/design/tracking-branches/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/governance/temporary-voting/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/technical/architecture/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/technical/concurrency/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
<url>
<loc>https://jj-vcs.github.io/jj/latest/technical/conflicts/</loc>
<lastmod>2025-01-18</lastmod>
<lastmod>2025-01-19</lastmod>
</url>
</urlset>

BIN
prerelease/sitemap.xml.gz
View File

Binary file not shown.