forked from mirrors/jj
Deployed c2220ca
to prerelease with MkDocs 1.6.0 and mike 2.1.1
This commit is contained in:
parent
b3ecabcade
commit
509a175199
4 changed files with 48 additions and 38 deletions
|
@ -1720,6 +1720,16 @@ important ones are:</p>
|
|||
or divergent changes.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>If the working copy commit or its parent contain any conflicted files, tools
|
||||
expecting a Git repo may interpret the commit contents or its diff in a wrong
|
||||
and confusing way. You should avoid doing mutating operations with Git tools
|
||||
and ignore the confusing information such tools present for conflicted commits
|
||||
(unless you are curious about <a href="../technical/conflicts/">the details of how <code>jj</code> stores
|
||||
conflicts</a>). See
|
||||
<a href="https://github.com/martinvonz/jj/issues/3979">#3979</a> for plans to improve
|
||||
this situation.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Jujutsu commands may be a little slower in very large repositories due to
|
||||
importing and exporting changes to Git. Most repositories are not noticeably
|
||||
affected by this. </p>
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -2,187 +2,187 @@
|
|||
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/FAQ/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/bookmarks/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/cli-reference/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/code-of-conduct/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/community_tools/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/config/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/conflicts/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/contributing/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design_doc_blueprint/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design_docs/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/filesets/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/git-comparison/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/git-compatibility/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/github/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/glossary/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/install-and-setup/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/operation-log/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/related-work/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/revsets/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/roadmap/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/sapling-comparison/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/templates/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/testimonials/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/tutorial/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/windows/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/working-copy/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/copy-tracking/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/git-submodule-storage/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/git-submodules/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/run/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/sparse-v2/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/tracking-branches/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/governance/temporary-voting/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/technical/architecture/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/technical/concurrency/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/technical/conflicts/</loc>
|
||||
<lastmod>2024-09-12</lastmod>
|
||||
<lastmod>2024-09-13</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
</urlset>
|
Binary file not shown.
Loading…
Reference in a new issue