mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-05 15:32:49 +00:00
Deployed 6ce7a77 to v0.27.0 with MkDocs 1.6.1 and mike 2.1.3
This commit is contained in:
jj-docs[bot]
parent
a79376119d
commit
51f46b3fa4
@ -12,7 +12,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="/jj/latest/images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="/jj/latest/assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="/jj/latest/assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="/jj/latest/assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -237,6 +237,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -267,6 +268,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -292,6 +294,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -313,6 +316,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -334,6 +338,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -355,6 +360,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -383,6 +389,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -403,6 +410,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -423,6 +431,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -443,6 +452,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -473,6 +483,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -498,6 +509,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -519,6 +531,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -540,6 +553,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -561,6 +575,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -582,6 +597,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -620,6 +636,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -645,6 +662,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -666,6 +684,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -687,6 +706,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -708,6 +728,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -746,6 +767,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -771,6 +793,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/latest/git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -792,6 +837,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -813,6 +859,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -834,6 +881,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -872,6 +920,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -897,6 +946,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -918,6 +968,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -939,6 +990,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -977,6 +1029,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1002,6 +1055,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1023,6 +1077,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1044,6 +1099,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1065,6 +1121,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1086,6 +1143,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1107,6 +1165,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/latest/governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1145,6 +1226,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1170,6 +1252,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1191,6 +1274,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1212,6 +1296,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1233,6 +1318,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1254,6 +1340,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1275,6 +1362,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1303,6 +1391,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1374,10 +1463,10 @@
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "/jj/latest", "features": [], "search": "/jj/latest/assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "/jj/latest", "features": [], "search": "/jj/latest/assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="/jj/latest/assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="/jj/latest/assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -403,6 +409,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -558,6 +566,30 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
<nav class="md-nav" aria-label="I accidentally changed files in the wrong commit, how do I move the recent changes into another commit?">
|
||||
<ul class="md-nav__list">
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#step-1-find-the-commit-id-for-the-last-good-version" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Step 1: Find the commit id for the "last good version"
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#step-2-create-a-new-change-for-the-current-state-and-restore-the-existing-change-to-the-older-state" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Step 2: Create a new change for the current state and restore the existing change to the older state
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
@ -634,6 +666,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -654,6 +687,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -674,6 +708,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -704,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -729,6 +765,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -750,6 +787,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -771,6 +809,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -792,6 +831,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -813,6 +853,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -851,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -876,6 +918,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -897,6 +940,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -918,6 +962,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -939,6 +984,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -977,6 +1023,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1002,6 +1049,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1023,6 +1093,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1044,6 +1115,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1065,6 +1137,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1103,6 +1176,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1128,6 +1202,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1149,6 +1224,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1170,6 +1246,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1208,6 +1285,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1233,6 +1311,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1254,6 +1333,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1275,6 +1355,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1296,6 +1377,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1317,6 +1399,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1338,6 +1421,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1376,6 +1482,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1401,6 +1508,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1422,6 +1530,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1443,6 +1552,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1464,6 +1574,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1485,6 +1596,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1506,6 +1618,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1534,6 +1647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1692,6 +1806,30 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
<nav class="md-nav" aria-label="I accidentally changed files in the wrong commit, how do I move the recent changes into another commit?">
|
||||
<ul class="md-nav__list">
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#step-1-find-the-commit-id-for-the-last-good-version" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Step 1: Find the commit id for the "last good version"
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#step-2-create-a-new-change-for-the-current-state-and-restore-the-existing-change-to-the-older-state" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Step 2: Create a new change for the current state and restore the existing change to the older state
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
@ -1763,6 +1901,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="frequently-asked-questions">Frequently asked questions<a class="headerlink" href="#frequently-asked-questions" title="Permanent link">¶</a></h1>
|
||||
<h3 id="why-does-my-bookmark-not-move-to-the-new-commit-after-jj-newcommit">Why does my bookmark not move to the new commit after <code>jj new/commit</code>?<a class="headerlink" href="#why-does-my-bookmark-not-move-to-the-new-commit-after-jj-newcommit" title="Permanent link">¶</a></h3>
|
||||
<p>If you're familiar with Git, you might expect the current bookmark to move forward
|
||||
@ -1993,17 +2132,153 @@ Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w
|
||||
</code></pre></div>
|
||||
<p>To avoid pushing change <em>wwwwwwww</em> by mistake, use the configuration
|
||||
<a href="../config/#set-of-private-commits">git.private-commits</a>:</p>
|
||||
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>config<span class="w"> </span><span class="nb">set</span><span class="w"> </span>--user<span class="w"> </span>git.private-commits<span class="w"> </span><span class="s1">'description(glob:"private:*")'</span>
|
||||
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>config<span class="w"> </span><span class="nb">set</span><span class="w"> </span>--user<span class="w"> </span>git.private-commits<span class="w"> </span><span class="s2">"'''description(glob:'private:*')'''"</span>
|
||||
</code></pre></div>
|
||||
<h3 id="i-accidentally-changed-files-in-the-wrong-commit-how-do-i-move-the-recent-changes-into-another-commit">I accidentally changed files in the wrong commit, how do I move the recent changes into another commit?<a class="headerlink" href="#i-accidentally-changed-files-in-the-wrong-commit-how-do-i-move-the-recent-changes-into-another-commit" title="Permanent link">¶</a></h3>
|
||||
<p>Use <code>jj evolog -p</code> to see how your working-copy commit has evolved. Find the
|
||||
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 --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>
|
||||
<p>Let's say we are editing a commit for "featureA", and we forgot to run <code>jj
|
||||
new</code> or <code>jj commit</code> before doing some work that belongs in a new commit:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="gp">$ </span>jj<span class="w"> </span>log
|
||||
<span class="go">@ lnvvtrzo jjfan@example.org 2025-02-28 21:01:10 31a347e0</span>
|
||||
<span class="go">│ featureA</span>
|
||||
<span class="go">◆ zzzzzzzz root() 00000000</span>
|
||||
<span class="gp">$ </span>cat<span class="w"> </span>file<span class="w"> </span><span class="c1"># Oh no, the work on "feature B" should be in a separate commit!</span>
|
||||
<span class="go">Done with feature A</span>
|
||||
<span class="go">Working on feature B</span>
|
||||
</code></pre></div>
|
||||
<h4 id="step-1-find-the-commit-id-for-the-last-good-version">Step 1: Find the commit id for the "last good version"<a class="headerlink" href="#step-1-find-the-commit-id-for-the-last-good-version" title="Permanent link">¶</a></h4>
|
||||
<!-- TODO: Reorganize the two related questions, this one and
|
||||
-- the one linked below
|
||||
-->
|
||||
<p>You can find <a href="#jj-is-said-to-record-the-working-copy-after-jj-log-and-every-other-command-where-can-i-see-these-automatic-saves">all the past versions of the working copy revision that <code>jj</code> has
|
||||
saved</a>
|
||||
by running <code>jj evolog</code>. The obsolete versions will be marked as "hidden" and
|
||||
will have the same change id, but will have different commit ids. This
|
||||
represents different <a href="../glossary/#commit">commits</a> that are all parts of the same <a href="../glossary/#change">change</a>.</p>
|
||||
<p>For example, this is what the evolog might look like after you made two edits to
|
||||
the same change:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="gp">$ </span><span class="c1"># Note the word "hidden", the commit ids on the right,</span>
|
||||
<span class="gp">$ </span><span class="c1"># and the unchanging change id on the left.</span>
|
||||
<span class="gp">$ </span>jj<span class="w"> </span>evolog
|
||||
<span class="go">@ lnvvtrzo jjfan@example.org 2025-02-28 21:01:10 31a347e0</span>
|
||||
<span class="go">│ featureA</span>
|
||||
<span class="go">○ lnvvtrzo hidden jjfan@example.org 2025-02-28 21:00:51 b8004ab8</span>
|
||||
<span class="go">│ featureA</span>
|
||||
<span class="go">○ lnvvtrzo hidden jjfan@example.org 2025-02-28 20:50:05 e4d831d</span>
|
||||
<span class="go"> (no description set)</span>
|
||||
</code></pre></div>
|
||||
<p>Since commit <code>b800</code> is hidden, it is considered obsolete and <code>jj log</code> (without
|
||||
arguments) will not show it, nor can it be accessed by its change id. However,
|
||||
most <code>jj</code> operations work normally on such commits if you refer to them by their
|
||||
commit id.</p>
|
||||
<p>To find out which of these versions is the last time before we started working
|
||||
on feature B (the point where we should have created a new change, but failed
|
||||
to do so), we can look at the actual changes between the <code>evolog</code> commits by
|
||||
running <code>jj evolog -p</code>:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="gp">$ </span><span class="c1"># When was the last saved point before we started working on feature B?</span>
|
||||
<span class="gp">$ </span>jj<span class="w"> </span>evolog<span class="w"> </span>-p<span class="w"> </span>--git<span class="w"> </span><span class="c1"># We use `--git` to make diffs clear without colors</span>
|
||||
<span class="go">@ lnvvtrzo jjfan@example.org 2025-02-28 21:01:10 31a347e0</span>
|
||||
<span class="go">│ featureA</span>
|
||||
<span class="go">│ diff --git a/file b/file</span>
|
||||
<span class="go">│ index 2b455c4207..2a7e05a01a 100644</span>
|
||||
<span class="go">│ --- a/file</span>
|
||||
<span class="go">│ +++ b/file</span>
|
||||
<span class="go">│ @@ -1,1 +1,2 @@</span>
|
||||
<span class="go">│ Done with feature A</span>
|
||||
<span class="go">│ +Working on feature B</span>
|
||||
<span class="go">○ lnvvtrzo hidden jjfan@example.org 2025-02-28 21:00:51 b8004ab8</span>
|
||||
<span class="go">│ featureA</span>
|
||||
<span class="go">│ diff --git a/file b/file</span>
|
||||
<span class="go">│ index cb61245109..2b455c4207</span>
|
||||
<span class="go">│ --- a/file</span>
|
||||
<span class="go">│ +++ b/file</span>
|
||||
<span class="go">│ @@ -1,1 +1,1 @@</span>
|
||||
<span class="go">│ -Working on feature A</span>
|
||||
<span class="go">│ +Done with feature A</span>
|
||||
<span class="go">○ lnvvtrzo hidden jjfan@example.org 2025-02-28 20:50:05 e4d831d</span>
|
||||
<span class="go"> (no description set)</span>
|
||||
<span class="go"> diff --git a/file b/file</span>
|
||||
<span class="go"> index 0000000000..cb61245109</span>
|
||||
<span class="go"> --- /dev/null</span>
|
||||
<span class="go"> +++ b/file</span>
|
||||
<span class="go"> @@ 0,0 +1,1 @@</span>
|
||||
<span class="go"> +Working on feature A</span>
|
||||
</code></pre></div>
|
||||
<p>In this example, the version of the change when we were actually done with
|
||||
feature A is when we edited the file to say "Done with feature A". This state
|
||||
was saved in the commit with id <code>b80</code> (the second one in the list). The
|
||||
following edit (commit <code>31a</code>) belongs in a new change.</p>
|
||||
<h4 id="step-2-create-a-new-change-for-the-current-state-and-restore-the-existing-change-to-the-older-state">Step 2: Create a new change for the current state and restore the existing change to the older state<a class="headerlink" href="#step-2-create-a-new-change-for-the-current-state-and-restore-the-existing-change-to-the-older-state" title="Permanent link">¶</a></h4>
|
||||
<p>The "featureA" change is currently at commit <code>31a</code>:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="gp">$ </span>jj<span class="w"> </span>log
|
||||
<span class="go">@ lnvvtrzo jjfan@example.org 2025-02-28 21:01:10 31a347e0</span>
|
||||
<span class="go">│ featureA</span>
|
||||
<span class="go">◆ zzzzzzzz root() 00000000</span>
|
||||
</code></pre></div>
|
||||
<p>We'd like to create a new "featureB" change with the contents of the current
|
||||
commit <code>31a</code>, and we'd like the "featureA" change to be reverted to its former
|
||||
state at commit <code>b80</code> (see step 1 above for how we found that commit id).</p>
|
||||
<p>First, we create a new empty child commit. Since it is empty, it has the same
|
||||
contents as <code>31a</code>.</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="gp">$ </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span><span class="s2">"featureB"</span>
|
||||
<span class="go">Working copy now at: pvnrkl 47171aa (empty) featureB</span>
|
||||
<span class="go">Parent commit : lnvvtr 31a347e featureA</span>
|
||||
<span class="gp">$ </span>cat<span class="w"> </span>file
|
||||
<span class="go">Done with feature A</span>
|
||||
<span class="go">Working on feature B</span>
|
||||
</code></pre></div>
|
||||
<p>Now, we <code>jj restore</code> the change <code>lnvvtr</code> to its state at commit <code>b80</code>. We use
|
||||
the <code>--restore-descendants</code> flag so that the <em>file contents</em> (AKA snapshot) of
|
||||
the "featureB" change is preserved.</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="gp">$ </span><span class="c1"># We refer to `lnvvtr` as `@-` for brevity</span>
|
||||
<span class="gp">$ </span>jj<span class="w"> </span>restore<span class="w"> </span>--from<span class="w"> </span>b80<span class="w"> </span>--into<span class="w"> </span>@-<span class="w"> </span>--restore-descendants
|
||||
<span class="go">Created lnvvtr 599994e featureA</span>
|
||||
<span class="go">Rebased 1 descendant commits (while preserving their content)</span>
|
||||
<span class="go">Working copy now at: pvnrkl 468104c featureB</span>
|
||||
<span class="go">Parent commit : lnvvtr 599994e featureA</span>
|
||||
</code></pre></div>
|
||||
<p>Even though <code>@-</code> was modified, <code>--restore-descendants</code> preserved the contents of
|
||||
the current change:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="gp">$ </span>jj<span class="w"> </span>file<span class="w"> </span>show<span class="w"> </span>-r<span class="w"> </span>@<span class="w"> </span>file<span class="w"> </span><span class="c1"># Same as `cat file`</span>
|
||||
<span class="go">Done with feature A</span>
|
||||
<span class="go">Working on feature B</span>
|
||||
<span class="gp">$ </span>jj<span class="w"> </span>file<span class="w"> </span>show<span class="w"> </span>-r<span class="w"> </span>@-<span class="w"> </span>file
|
||||
<span class="go">Done with feature A</span>
|
||||
</code></pre></div>
|
||||
<details class="info">
|
||||
<summary>More details on what <code>--restore-descendants</code> does</summary>
|
||||
<p>When we ran the <code>jj restore</code> command, the working copy change <code>@</code> was
|
||||
at commit <code>471</code> and <code>@</code> was the only child of <code>@-</code>. In this situation,</p>
|
||||
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>restore<span class="w"> </span>--from<span class="w"> </span>b80<span class="w"> </span>--into<span class="w"> </span>@-<span class="w"> </span>--restore-descendants
|
||||
</code></pre></div>
|
||||
<p>is equivalent to</p>
|
||||
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>restore<span class="w"> </span>--from<span class="w"> </span>b80<span class="w"> </span>--into<span class="w"> </span>@-
|
||||
jj<span class="w"> </span>restore<span class="w"> </span>--from<span class="w"> </span><span class="m">471</span><span class="w"> </span>--into<span class="w"> </span>@
|
||||
</code></pre></div>
|
||||
</details>
|
||||
<p>Now, we have achieved the exact state we desired:</p>
|
||||
<div class="highlight"><pre><span></span><code>$ jj log -p --git
|
||||
@ pvnrklkn jjfan@example.org 2025-02-28 21:39:29 468104c2
|
||||
│ featureB
|
||||
│ diff --git a/file b/file
|
||||
│ index 2b455c4207..2a7e05a01a 100644
|
||||
│ --- a/file
|
||||
│ +++ b/file
|
||||
│ @@ -1,1 +1,2 @@
|
||||
│ Done with feature A
|
||||
│ +Working on feature B
|
||||
○ lnvvtrzo jjfan@example.org 2025-02-28 21:39:29 599994ee
|
||||
│ featureA
|
||||
│ diff --git a/file b/file
|
||||
│ new file mode 100644
|
||||
│ index 0000000000..2b455c4207
|
||||
│ --- /dev/null
|
||||
│ +++ b/file
|
||||
│ @@ -0,0 +1,1 @@
|
||||
│ +Done with feature A
|
||||
◆ zzzzzzzz root() 00000000
|
||||
$ jj diff --from b80 --to @- # No output means these are identical
|
||||
$ jj diff --from 31a --to @ # No output means these are identical
|
||||
</code></pre></div>
|
||||
<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">¶</a></h3>
|
||||
<p>There are two ways to resume working on an earlier change: <code>jj new</code> then <code>jj squash</code>,
|
||||
and <code>jj edit</code>. The first is generally recommended, but <code>jj edit</code> can be useful. When
|
||||
@ -2116,10 +2391,10 @@ detect custom backends and more).</li>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
latest/assets/stylesheets/main.8608ea7d.min.css
vendored
Normal file
1
latest/assets/stylesheets/main.8608ea7d.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
1
latest/assets/stylesheets/main.8608ea7d.min.css.map
Normal file
1
latest/assets/stylesheets/main.8608ea7d.min.css.map
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -486,6 +496,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -511,6 +522,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -541,6 +553,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -552,6 +565,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -707,6 +721,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -728,6 +743,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -749,6 +765,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -787,6 +804,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -812,6 +830,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -833,6 +852,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -854,6 +874,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -875,6 +896,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -913,6 +935,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -938,6 +961,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -959,6 +1005,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -980,6 +1027,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1001,6 +1049,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1039,6 +1088,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1064,6 +1114,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1085,6 +1136,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1106,6 +1158,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1144,6 +1197,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1169,6 +1223,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1190,6 +1245,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1211,6 +1267,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1232,6 +1289,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1253,6 +1311,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1274,6 +1333,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1312,6 +1394,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1337,6 +1420,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1358,6 +1442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1379,6 +1464,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1400,6 +1486,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1421,6 +1508,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1442,6 +1530,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1470,6 +1559,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1633,6 +1723,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="bookmarks">Bookmarks<a class="headerlink" href="#bookmarks" title="Permanent link">¶</a></h1>
|
||||
<h2 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">¶</a></h2>
|
||||
<p>Bookmarks are named pointers to revisions (just like branches are in Git). You
|
||||
@ -1823,8 +1914,8 @@ propagate to the local bookmark (which was presumably also conflicted).</p>
|
||||
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>
|
||||
For example, <code>jj bookmark create BOOKMARK-NAME -r@</code> can be abbreviated as
|
||||
<code>jj b c BOOKMARK-NAME -r@</code>.</p>
|
||||
<div class="footnote">
|
||||
<hr />
|
||||
<ol>
|
||||
@ -1880,10 +1971,10 @@ For example, <code>jj bookmark create BOOKMARK-NAME</code> can be abbreviated as
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -883,6 +931,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -908,6 +957,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -929,6 +979,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -990,6 +1042,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1015,6 +1068,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1045,6 +1099,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1056,6 +1111,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1202,6 +1258,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1223,6 +1280,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1244,6 +1302,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1265,6 +1324,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1303,6 +1385,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1328,6 +1411,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1349,6 +1433,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1370,6 +1455,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1391,6 +1477,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1412,6 +1499,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1433,6 +1521,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1461,6 +1550,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1615,6 +1705,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="contributor-covenant-code-of-conduct">Contributor Covenant Code of Conduct<a class="headerlink" href="#contributor-covenant-code-of-conduct" title="Permanent link">¶</a></h1>
|
||||
<h2 id="our-pledge">Our Pledge<a class="headerlink" href="#our-pledge" title="Permanent link">¶</a></h2>
|
||||
<p>We as members, contributors, and leaders pledge to make participation in our
|
||||
@ -1757,10 +1848,10 @@ version 2.1, available at
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -463,6 +472,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -474,6 +484,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -605,6 +616,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -630,6 +642,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -651,6 +664,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -672,6 +686,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -693,6 +708,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -714,6 +730,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -752,6 +769,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -777,6 +795,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -798,6 +817,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -819,6 +839,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -840,6 +861,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -878,6 +900,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -903,6 +926,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -924,6 +970,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -945,6 +992,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -966,6 +1014,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1004,6 +1053,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1029,6 +1079,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1050,6 +1101,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1071,6 +1123,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1109,6 +1162,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1134,6 +1188,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1155,6 +1210,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1176,6 +1232,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1197,6 +1254,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1218,6 +1276,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1239,6 +1298,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1277,6 +1359,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1302,6 +1385,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1323,6 +1407,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1344,6 +1429,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1365,6 +1451,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1386,6 +1473,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1407,6 +1495,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1435,6 +1524,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1565,6 +1655,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="community-built-tools-around-jujutsu">Community-built tools around Jujutsu<a class="headerlink" href="#community-built-tools-around-jujutsu" title="Permanent link">¶</a></h1>
|
||||
<p><strong>Important:</strong> Many of these are not complete yet, just like Jujutsu itself.
|
||||
But they already simplify many workflows and can improve your experience.</p>
|
||||
@ -1651,10 +1742,10 @@ VisualJJ is not open-source.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{
|
||||
"$schema": "http://json-schema.org/draft-07/schema",
|
||||
"$schema": "http://json-schema.org/draft-04/schema",
|
||||
"$comment": "`taplo` and the corresponding VS Code plugins only support draft-04 verstion of JSON Schema, see <https://taplo.tamasfe.dev/configuration/developing-schemas.html>. draft-07 is mostly compatible with it, newer versions may not be.",
|
||||
"title": "Jujutsu config",
|
||||
"type": "object",
|
||||
"description": "User configuration for Jujutsu VCS. See https://jj-vcs.github.io/jj/latest/config/ for details",
|
||||
@ -45,19 +46,23 @@
|
||||
"git"
|
||||
],
|
||||
"default": "diff"
|
||||
},
|
||||
"command-env": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"command": {
|
||||
"type": ["array", "string"],
|
||||
"items": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"env": {
|
||||
"type": "object"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"properties": {
|
||||
"allow-init-native": {
|
||||
"type": "boolean",
|
||||
"description": "Whether to allow initializing a repo with the native backend",
|
||||
"default": false
|
||||
},
|
||||
"allow-filesets": {
|
||||
"type": "boolean",
|
||||
"description": "Whether to parse path arguments as fileset expressions",
|
||||
"default": true
|
||||
},
|
||||
"always-allow-large-revsets": {
|
||||
"type": "boolean",
|
||||
"description": "Whether to allow large revsets to be used in all commands without the `all:` modifier",
|
||||
@ -103,7 +108,20 @@
|
||||
"default": "auto"
|
||||
},
|
||||
"pager": {
|
||||
"type": "string",
|
||||
"oneOf": [
|
||||
{
|
||||
"type": "string"
|
||||
},
|
||||
{
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
{
|
||||
"$ref": "#/properties/ui/definitions/command-env"
|
||||
}
|
||||
],
|
||||
"description": "Pager to use for displaying command output",
|
||||
"default": "less -FRX"
|
||||
},
|
||||
@ -145,7 +163,10 @@
|
||||
"default": "color-words"
|
||||
},
|
||||
"tool": {
|
||||
"type": "string",
|
||||
"type": ["array", "string"],
|
||||
"items": {
|
||||
"type": "string"
|
||||
},
|
||||
"description": "External tool for generating diffs"
|
||||
}
|
||||
}
|
||||
@ -182,17 +203,21 @@
|
||||
"default": true
|
||||
},
|
||||
"editor": {
|
||||
"type": "string",
|
||||
"type": ["array", "string"],
|
||||
"items": {
|
||||
"type": "string"
|
||||
},
|
||||
"description": "Editor to use for commands that involve editing text"
|
||||
},
|
||||
"diff-editor": {
|
||||
"type": "string",
|
||||
"description": "Editor tool to use for editing diffs",
|
||||
"default": "meld"
|
||||
"default": ":builtin"
|
||||
},
|
||||
"merge-editor": {
|
||||
"type": "string",
|
||||
"description": "Tool to use for resolving three-way merges. Behavior for a given tool name can be configured in merge-tools.TOOL tables"
|
||||
"description": "Tool to use for resolving three-way merges. Behavior for a given tool name can be configured in merge-tools.TOOL tables",
|
||||
"default": ":builtin"
|
||||
},
|
||||
"conflict-marker-style": {
|
||||
"$ref": "#/properties/ui/definitions/conflict-marker-style"
|
||||
@ -272,37 +297,8 @@
|
||||
"$ref": "#/properties/colors/definitions/hexColor"
|
||||
}
|
||||
]
|
||||
},
|
||||
"basicFormatterLabels": {
|
||||
"enum": [
|
||||
"description",
|
||||
"change_id",
|
||||
"commit_id",
|
||||
"author",
|
||||
"committer",
|
||||
"working_copies",
|
||||
"current_working_copy",
|
||||
"bookmarks",
|
||||
"tags",
|
||||
"git_refs",
|
||||
"is_git_head",
|
||||
"divergent",
|
||||
"hidden",
|
||||
"conflict",
|
||||
"root"
|
||||
]
|
||||
}
|
||||
},
|
||||
"propertyNames": {
|
||||
"oneOf": [
|
||||
{
|
||||
"$ref": "#/properties/colors/definitions/basicFormatterLabels"
|
||||
},
|
||||
{
|
||||
"type": "string"
|
||||
}
|
||||
]
|
||||
},
|
||||
"additionalProperties": {
|
||||
"description": "A color profile for the given formatter label. Either a bare color name used as the foreground color or a table describing color and formatting",
|
||||
"oneOf": [
|
||||
@ -417,7 +413,7 @@
|
||||
"subprocess": {
|
||||
"type": "boolean",
|
||||
"description": "Whether jj spawns a git subprocess for network operations (push/fetch/clone)",
|
||||
"default": false
|
||||
"default": true
|
||||
},
|
||||
"executable-path": {
|
||||
"type": "string",
|
||||
@ -511,6 +507,11 @@
|
||||
"type": "string",
|
||||
"description": "Default set of revisions to simplify when no explicit revset is given for jj simplify-parents",
|
||||
"default": "reachable(@, mutable())"
|
||||
},
|
||||
"sign": {
|
||||
"type": "string",
|
||||
"description": "Default set of revisions to sign when no explicit revset is given for jj sign",
|
||||
"default": "reachable(@, mutable())"
|
||||
}
|
||||
},
|
||||
"additionalProperties": {
|
||||
@ -606,10 +607,10 @@
|
||||
"type": "string",
|
||||
"description": "The key the configured signing backend will use to to sign commits. Overridden by `jj sign` parameter or by the global `--sign-with` option"
|
||||
},
|
||||
"sign-all": {
|
||||
"type": "boolean",
|
||||
"description": "Whether to sign all commits by default. Overridden by global `--no-sign` option",
|
||||
"default": false
|
||||
"behavior": {
|
||||
"type": "string",
|
||||
"enum": ["drop", "keep", "own", "force"],
|
||||
"description": "Which commits to sign by default. Values: drop (never sign), keep (preserve existing signatures), own (sign own commits), force (sign all commits)"
|
||||
},
|
||||
"backends": {
|
||||
"type": "object",
|
||||
@ -639,9 +640,8 @@
|
||||
"default": "ssh-keygen"
|
||||
},
|
||||
"allowed-signers": {
|
||||
"type": "boolean",
|
||||
"description": "Path to an allowed signers file used for signature verification",
|
||||
"default": true
|
||||
"type": "string",
|
||||
"description": "Path to an allowed signers file used for signature verification"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -650,7 +650,7 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"fix": {
|
||||
"fix": {
|
||||
"type": "object",
|
||||
"description": "Settings for jj fix",
|
||||
"properties": {
|
||||
@ -684,6 +684,17 @@
|
||||
"description": "Settings for tools run by jj fix"
|
||||
}
|
||||
}
|
||||
},
|
||||
"split": {
|
||||
"type": "object",
|
||||
"description": "Settings for jj split",
|
||||
"properties": {
|
||||
"legacy-bookmark-behavior": {
|
||||
"type": "boolean",
|
||||
"description": "If true, bookmarks will move to the second commit instead of the first.",
|
||||
"default": false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -633,6 +649,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -667,6 +684,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -678,6 +696,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1234,6 +1253,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#manually-signing-commits" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Manually signing commits
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
@ -1448,6 +1476,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1469,6 +1498,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1490,6 +1520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1528,6 +1559,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1553,6 +1585,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1574,6 +1629,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1595,6 +1651,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1616,6 +1673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1654,6 +1712,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1679,6 +1738,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1700,6 +1760,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1721,6 +1782,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1759,6 +1821,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1784,6 +1847,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1805,6 +1869,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1826,6 +1891,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1847,6 +1913,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1868,6 +1935,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1889,6 +1957,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1927,6 +2018,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1952,6 +2044,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1973,6 +2066,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1994,6 +2088,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -2015,6 +2110,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -2036,6 +2132,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -2057,6 +2154,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -2085,6 +2183,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -2655,6 +2754,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#manually-signing-commits" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Manually signing commits
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
@ -2863,6 +2971,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="configuration">Configuration<a class="headerlink" href="#configuration" title="Permanent link">¶</a></h1>
|
||||
<p>These are the config settings available to jj/Jujutsu.</p>
|
||||
<h2 id="config-files-and-toml">Config files and TOML<a class="headerlink" href="#config-files-and-toml" title="Permanent link">¶</a></h2>
|
||||
@ -3119,6 +3228,14 @@ also consider the <code>release@origin</code> bookmark immutable:</p>
|
||||
</code></pre></div>
|
||||
<p>Ancestors of the configured set are also immutable. The root commit is always
|
||||
immutable even if the set is empty.</p>
|
||||
<p>Immutable commits (other than the root commit) can be rewritten using the
|
||||
<code>--ignore-immutable</code> CLI flag.</p>
|
||||
<div class="admonition warning">
|
||||
<p class="admonition-title">Warning</p>
|
||||
<p>Using <code>--ignore-immutable</code> will allow you to rewrite any commit in the
|
||||
history, and all descendants, without warning. Use this power wisely, and
|
||||
remember <code>jj undo</code>.</p>
|
||||
</div>
|
||||
<h3 id="behavior-of-prev-and-next-commands">Behavior of prev and next commands<a class="headerlink" href="#behavior-of-prev-and-next-commands" title="Permanent link">¶</a></h3>
|
||||
<p>If you prefer using an "edit-based" workflow, rather than squashing
|
||||
modifications into parent changes, you may find yourself using the <code>prev</code> and
|
||||
@ -3207,6 +3324,11 @@ the terminal width.</p>
|
||||
<span class="c1"># Uppercase change ids. `jj` treats change and commit ids as case-insensitive.</span>
|
||||
<span class="s1">'format_short_change_id(id)'</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s1">'format_short_id(id).upper()'</span>
|
||||
</code></pre></div>
|
||||
<p>Operation ids can be customized by the <code>format_short_operation_id()</code> alias:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[template-aliases]</span>
|
||||
<span class="c1"># Always show 12 characters</span>
|
||||
<span class="s1">'format_short_operation_id(id)'</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s1">'id.short(12)'</span>
|
||||
</code></pre></div>
|
||||
<p>To get shorter prefixes for certain revisions, set <code>revsets.short-prefixes</code>:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[revsets]</span>
|
||||
<span class="c1"># Prioritize the current bookmark</span>
|
||||
@ -3734,7 +3856,7 @@ GnuPG or SSH signing keys.</p>
|
||||
<p>Setting the backend to <code>"none"</code> disables signing.</p>
|
||||
<h3 id="gnupg-signing">GnuPG Signing<a class="headerlink" href="#gnupg-signing" title="Permanent link">¶</a></h3>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[signing]</span>
|
||||
<span class="n">sign-all</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">true</span>
|
||||
<span class="n">behavior</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"own"</span>
|
||||
<span class="n">backend</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"gpg"</span>
|
||||
<span class="n">key</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"4ED556E9729E000F"</span>
|
||||
<span class="c1">## You can set `key` to anything accepted by `gpg -u`</span>
|
||||
@ -3752,7 +3874,7 @@ To consider expired keys as invalid you can set:</p>
|
||||
</code></pre></div>
|
||||
<h3 id="ssh-signing">SSH Signing<a class="headerlink" href="#ssh-signing" title="Permanent link">¶</a></h3>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[signing]</span>
|
||||
<span class="n">sign-all</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">true</span>
|
||||
<span class="n">behavior</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"own"</span>
|
||||
<span class="n">backend</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"ssh"</span>
|
||||
<span class="n">key</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGj+J6N6SO+4P8dOZqfR1oiay2yxhhHnagH52avUqw5h"</span>
|
||||
<span class="c1">## You can also use a path instead of embedding the key</span>
|
||||
@ -3772,20 +3894,31 @@ as follows:</p>
|
||||
<span class="n">backends</span><span class="p">.</span><span class="n">ssh</span><span class="p">.</span><span class="n">allowed-signers</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"/path/to/allowed-signers"</span>
|
||||
</code></pre></div>
|
||||
<h3 id="sign-commits-only-on-jj-git-push">Sign commits only on <code>jj git push</code><a class="headerlink" href="#sign-commits-only-on-jj-git-push" title="Permanent link">¶</a></h3>
|
||||
<p>Instead of signing all commits during creation when <code>signing.sign-all</code> is
|
||||
set to <code>true</code>, the <code>git.sign-on-push</code> configuration can be used to sign
|
||||
<p>Instead of signing all commits during creation when <code>signing.behavior</code> is
|
||||
set to <code>own</code>, the <code>git.sign-on-push</code> configuration can be used to sign
|
||||
commits only upon running <code>jj git push</code>. All mutable unsigned commits
|
||||
being pushed will be signed prior to pushing. This might be preferred if the
|
||||
signing backend requires user interaction or is slow, so that signing is
|
||||
performed in a single batch operation.</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># Configure signing backend as before, without setting `signing.sign-all`</span>
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># Configure signing backend as before, but lazily signing only on push.</span>
|
||||
<span class="k">[signing]</span>
|
||||
<span class="n">behavior</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"drop"</span>
|
||||
<span class="n">backend</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"ssh"</span>
|
||||
<span class="n">key</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGj+J6N6SO+4P8dOZqfR1oiay2yxhhHnagH52avUqw5h"</span>
|
||||
|
||||
<span class="k">[git]</span>
|
||||
<span class="n">sign-on-push</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">true</span>
|
||||
</code></pre></div>
|
||||
<h3 id="manually-signing-commits">Manually signing commits<a class="headerlink" href="#manually-signing-commits" title="Permanent link">¶</a></h3>
|
||||
<p>You can use <a href="../cli-reference/#jj-sign"><code>jj sign</code></a>/<a href="../cli-reference/#jj-unsign"><code>jj unsign</code></a>
|
||||
to sign/unsign commits manually.</p>
|
||||
<div class="admonition warning">
|
||||
<p class="admonition-title">Warning</p>
|
||||
<p><code>jj sign</code> is always signing commits, even if they are already signed by the
|
||||
user. While this is cumbersome for users signing via hardware devices, we
|
||||
cannot reliably check if a commit is already signed without creating a
|
||||
signature (see <a href="https://github.com/jj-vcs/jj/issues/5786">this issue</a>).</p>
|
||||
</div>
|
||||
<h2 id="commit-signature-verification">Commit Signature Verification<a class="headerlink" href="#commit-signature-verification" title="Permanent link">¶</a></h2>
|
||||
<p>By default signature verification and display is <strong>disabled</strong> as it incurs a
|
||||
performance cost when rendering medium to large change logs.</p>
|
||||
@ -3806,6 +3939,11 @@ single remote, or a list of remotes to fetch from multiple places:</p>
|
||||
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>config<span class="w"> </span><span class="nb">set</span><span class="w"> </span>--repo<span class="w"> </span>git.fetch<span class="w"> </span><span class="s2">"upstream"</span>
|
||||
jj<span class="w"> </span>config<span class="w"> </span><span class="nb">set</span><span class="w"> </span>--repo<span class="w"> </span>git.fetch<span class="w"> </span><span class="s1">'["origin", "upstream"]'</span>
|
||||
</code></pre></div>
|
||||
<p>By default, the specified remote names matches exactly. You can also use a
|
||||
<a href="../revsets/#string-patterns">string pattern</a> to select remotes using patterns:</p>
|
||||
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>config<span class="w"> </span><span class="nb">set</span><span class="w"> </span>--repo<span class="w"> </span>git.fetch<span class="w"> </span><span class="s2">"glob:*"</span>
|
||||
jj<span class="w"> </span>config<span class="w"> </span><span class="nb">set</span><span class="w"> </span>--repo<span class="w"> </span>git.fetch<span class="w"> </span><span class="s1">'["glob:remote*", "glob:upstream*"]'</span>
|
||||
</code></pre></div>
|
||||
<p>Similarly, you can also set the variable <code>git.push</code> to cause <code>jj git push</code> to
|
||||
push to a different remote:</p>
|
||||
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>config<span class="w"> </span><span class="nb">set</span><span class="w"> </span>--repo<span class="w"> </span>git.push<span class="w"> </span><span class="s2">"github"</span>
|
||||
@ -3865,19 +4003,22 @@ from the private set.</p>
|
||||
<p>Private commits prevent their descendants from being pushed, since doing so
|
||||
would require pushing the private commit as well.</p>
|
||||
<h3 id="git-subprocessing-behaviour">Git subprocessing behaviour<a class="headerlink" href="#git-subprocessing-behaviour" title="Permanent link">¶</a></h3>
|
||||
<p>By default, Git remote interactions are handled by <a href="https://github.com/libgit2/libgit2"><code>libgit2</code></a>.
|
||||
This sometimes causes <a href="https://github.com/jj-vcs/jj/issues/4979">SSH problems</a> that
|
||||
cannot be solved by <code>jj</code> directly.</p>
|
||||
<p>To sidestep this, there is an option to spawn a <code>git</code> subprocess to handle those
|
||||
remote interactions:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[git]</span>
|
||||
<span class="n">subprocess</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">true</span>
|
||||
</code></pre></div>
|
||||
<p>Additionally, if <code>git</code> is not on your OS path, or you want to specify a
|
||||
particular binary, you can:</p>
|
||||
<p>By default, Git remote interactions are handled by spawning a <code>git</code> subprocess.
|
||||
If <code>git</code> is not on your OS path, or you want to specify a particular binary,
|
||||
you can:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[git]</span>
|
||||
<span class="n">executable-path</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"/path/to/git"</span>
|
||||
</code></pre></div>
|
||||
<p>Previously, remote interactions were handled by
|
||||
<a href="https://github.com/libgit2/libgit2"><code>libgit2</code></a> by default, which sometimes
|
||||
caused <a href="https://github.com/jj-vcs/jj/issues/4979">SSH problems</a> that could not
|
||||
be solved by <code>jj</code> directly. If you have any issues with the <code>git</code>
|
||||
subprocessing, you can switch back to <code>libgit2</code> with:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[git]</span>
|
||||
<span class="n">subprocess</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">false</span>
|
||||
</code></pre></div>
|
||||
<p>Note that <code>libgit2</code> support will likely be removed in the future, so you are
|
||||
encouraged to report any issues you experience with the default configuration.</p>
|
||||
<h2 id="filesystem-monitor">Filesystem monitor<a class="headerlink" href="#filesystem-monitor" title="Permanent link">¶</a></h2>
|
||||
<p>In large repositories, it may be beneficial to use a "filesystem monitor" to
|
||||
track changes to the working copy. This allows <code>jj</code> to take working copy
|
||||
@ -3996,12 +4137,6 @@ config files:</p>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
<p>Sublime Text</p>
|
||||
<ul>
|
||||
<li>Install <a href="https://packagecontrol.io/packages/LSP">LSP</a> and <a href="https://packagecontrol.io/packages/LSP-taplo">LSP-taplo</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
<p>Emacs</p>
|
||||
<ul>
|
||||
<li>Install <a href="https://github.com/emacs-lsp/lsp-mode">lsp-mode</a> and <a href="https://github.com/dryman/toml-mode.el">toml-mode</a></li>
|
||||
@ -4120,10 +4255,10 @@ workspace</code>.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -486,6 +496,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -511,6 +522,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -532,6 +544,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -562,6 +575,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -573,6 +587,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -668,6 +683,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -689,6 +705,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -727,6 +744,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -752,6 +770,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -773,6 +792,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -794,6 +814,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -815,6 +836,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -853,6 +875,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -878,6 +901,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -899,6 +945,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -920,6 +967,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -941,6 +989,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -979,6 +1028,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1004,6 +1054,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1025,6 +1076,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1046,6 +1098,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1084,6 +1137,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1109,6 +1163,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1130,6 +1185,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1151,6 +1207,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1172,6 +1229,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1193,6 +1251,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1214,6 +1273,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1252,6 +1334,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1277,6 +1360,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1298,6 +1382,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1319,6 +1404,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1340,6 +1426,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1361,6 +1448,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1382,6 +1470,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1410,6 +1499,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1513,6 +1603,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="first-class-conflicts">First-class conflicts<a class="headerlink" href="#first-class-conflicts" title="Permanent link">¶</a></h1>
|
||||
<h2 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">¶</a></h2>
|
||||
<p>Conflicts happen when Jujutsu can't figure out how to merge different changes
|
||||
@ -1580,11 +1671,11 @@ will materialize the conflict in the working copy using conflict markers, which
|
||||
would look like this:</p>
|
||||
<div class="highlight"><pre><span></span><code><<<<<<< Conflict 1 of 1
|
||||
%%%%%%% Changes from base to side #1
|
||||
<span class="w"> </span>apple
|
||||
<span class="gd">-grape</span>
|
||||
<span class="gi">+grapefruit</span>
|
||||
<span class="w"> </span>orange
|
||||
<span class="gi">+++++++ Contents of side #2</span>
|
||||
apple
|
||||
-grape
|
||||
+grapefruit
|
||||
orange
|
||||
+++++++ Contents of side #2
|
||||
APPLE
|
||||
GRAPE
|
||||
ORANGE
|
||||
@ -1615,15 +1706,15 @@ requires applying each diff to the snapshot one-by-one.</p>
|
||||
diff, Jujutsu also supports a "snapshot" style, which can be enabled by setting
|
||||
the <code>ui.conflict-marker-style</code> config option to "snapshot":</p>
|
||||
<div class="highlight"><pre><span></span><code><<<<<<< Conflict 1 of 1
|
||||
<span class="gi">+++++++ Contents of side #1</span>
|
||||
+++++++ Contents of side #1
|
||||
apple
|
||||
grapefruit
|
||||
orange
|
||||
<span class="gd">------- Contents of base</span>
|
||||
------- Contents of base
|
||||
apple
|
||||
grape
|
||||
orange
|
||||
<span class="gi">+++++++ Contents of side #2</span>
|
||||
+++++++ Contents of side #2
|
||||
APPLE
|
||||
GRAPE
|
||||
ORANGE
|
||||
@ -1641,7 +1732,7 @@ orange
|
||||
apple
|
||||
grape
|
||||
orange
|
||||
<span class="gh">=======</span>
|
||||
=======
|
||||
APPLE
|
||||
GRAPE
|
||||
ORANGE
|
||||
@ -1658,12 +1749,12 @@ markers and which are just part of the file contents, <code>jj</code> sometimes
|
||||
conflict markers which are longer than normal:</p>
|
||||
<div class="highlight"><pre><span></span><code><<<<<<<<<<<<<<< Conflict 1 of 1
|
||||
%%%%%%%%%%%%%%% Changes from base to side #1
|
||||
<span class="gd">-Heading</span>
|
||||
<span class="gi">+HEADING</span>
|
||||
<span class="w"> </span>=======
|
||||
<span class="gi">+++++++++++++++ Contents of side #2</span>
|
||||
-Heading
|
||||
+HEADING
|
||||
=======
|
||||
+++++++++++++++ Contents of side #2
|
||||
New Heading
|
||||
<span class="gh">===========</span>
|
||||
===========
|
||||
>>>>>>>>>>>>>>> Conflict 1 of 1 ends
|
||||
</code></pre></div>
|
||||
<h2 id="conflicts-with-missing-terminating-newline">Conflicts with missing terminating newline<a class="headerlink" href="#conflicts-with-missing-terminating-newline" title="Permanent link">¶</a></h2>
|
||||
@ -1681,11 +1772,11 @@ character, and one person changed <code>grape</code> to <code>grapefruit</code>,
|
||||
added the missing newline character to make <code>grape\n</code>, the resulting conflict
|
||||
would look like this:</p>
|
||||
<div class="highlight"><pre><span></span><code><<<<<<< Conflict 1 of 1
|
||||
<span class="gi">+++++++ Contents of side #1 (no terminating newline)</span>
|
||||
+++++++ Contents of side #1 (no terminating newline)
|
||||
grapefruit
|
||||
%%%%%%% Changes from base to side #2 (adds terminating newline)
|
||||
<span class="gd">-grape</span>
|
||||
<span class="gi">+grape</span>
|
||||
-grape
|
||||
+grape
|
||||
>>>>>>> Conflict 1 of 1 ends
|
||||
</code></pre></div>
|
||||
<p>Therefore, a resolution of this conflict could be <code>grapefruit\n</code>, with the
|
||||
@ -1736,10 +1827,10 @@ terminating newline character added.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -883,6 +931,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -908,6 +957,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -929,6 +979,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -990,6 +1042,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1024,6 +1077,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1035,6 +1089,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1322,6 +1377,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1343,6 +1399,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1364,6 +1421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1385,6 +1443,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1406,6 +1465,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1444,6 +1526,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1469,6 +1552,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1490,6 +1574,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1511,6 +1596,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1532,6 +1618,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1553,6 +1640,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1574,6 +1662,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1602,6 +1691,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1897,6 +1987,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="how-to-contribute">How to Contribute<a class="headerlink" href="#how-to-contribute" title="Permanent link">¶</a></h1>
|
||||
<h2 id="policies">Policies<a class="headerlink" href="#policies" title="Permanent link">¶</a></h2>
|
||||
<p>We'd love to accept your patches and contributions to this project. There are
|
||||
@ -1950,10 +2041,12 @@ will automatically force-push the bookmark.</p>
|
||||
so you can address any remaining minor comments and then merge the PR yourself
|
||||
when you're ready. If you realize that some comments require non-trivial
|
||||
changes, please ask your reviewer to take another look.</p>
|
||||
<p>To avoid conflicts of interest, please don't merge a PR that has only been
|
||||
approved by someone from the same organization. Similarly, as a reviewer,
|
||||
there is no need to approve your coworkers' PRs, since the author should await
|
||||
an approval from someone else anyway. It is of course still appreciated if you
|
||||
<p>If your employer pays anyone (not necessarily you) to contribute to Jujutsu,
|
||||
please make sure your GitHub username is <a href="../paid_contributors/">recorded</a>.
|
||||
To avoid conflicts of interest, please don't merge a PR that has only been
|
||||
approved by someone from the same organization. Similarly, as a reviewer, there
|
||||
is no need to approve your coworkers' PRs, since the author should await an
|
||||
approval from someone else anyway. It is of course still appreciated if you
|
||||
review and comment on their PRs. Also, if the PR seems completely unrelated to
|
||||
your company's interests, do feel free to approve it.</p>
|
||||
<h3 id="community-guidelines">Community Guidelines<a class="headerlink" href="#community-guidelines" title="Permanent link">¶</a></h3>
|
||||
@ -2220,8 +2313,7 @@ to use the <code>gh-pages</code> bookmark (this is usually the default).</p>
|
||||
<p>Install <code>uv</code> as explained in <a href="#previewing-the-html-documentation">Previewing the HTML
|
||||
documentation</a>, and run the same <code>sh</code> script
|
||||
that is used in GitHub CI (details below):</p>
|
||||
<div class="highlight"><pre><span></span><code>.github/scripts/docs-build-deploy<span class="w"> </span><span class="s1">'https://jjfan.github.io/jj/'</span><span class="se">\</span>
|
||||
<span class="w"> </span>prerelease<span class="w"> </span>main<span class="w"> </span>--push
|
||||
<div class="highlight"><pre><span></span><code>.github/scripts/docs-build-deploy<span class="w"> </span>prerelease<span class="w"> </span>main<span class="w"> </span>--push
|
||||
</code></pre></div>
|
||||
<p>This should build the version of the docs from the current commit,
|
||||
deploy it as a new commit to the <code>gh-pages</code> bookmark,
|
||||
@ -2237,8 +2329,7 @@ to the <code>prerelease</code> version, at <code>https://jjfan.github.io/jj/prer
|
||||
<code>https://jjfan.github.io/jj/main/</code>. If you'd like to test out version switching
|
||||
back and forth, you can also rebuild the docs for the latest release as follows.</p>
|
||||
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>new<span class="w"> </span>v1.33.1<span class="w"> </span><span class="c1"># Let's say `jj 1.33.1` is the currently the latest release</span>
|
||||
.github/scripts/docs-build-deploy<span class="w"> </span><span class="s1">'https://jjfan.github.io/jj/'</span><span class="se">\</span>
|
||||
<span class="w"> </span>v1.33.1<span class="w"> </span>latest<span class="w"> </span>--push
|
||||
.github/scripts/docs-build-deploy<span class="w"> </span>v1.33.1<span class="w"> </span>latest<span class="w"> </span>--push
|
||||
</code></pre></div>
|
||||
</li>
|
||||
<li>
|
||||
@ -2255,18 +2346,20 @@ jj<span class="w"> </span>git<span class="w"> </span>push<span class="w"> </span
|
||||
</li>
|
||||
</ol>
|
||||
<h3 id="explanation-of-the-docs-build-deploy-script">Explanation of the <code>docs-build-deploy</code> script<a class="headerlink" href="#explanation-of-the-docs-build-deploy-script" title="Permanent link">¶</a></h3>
|
||||
<p>The script sets up the <code>site_url</code> mkdocs config to
|
||||
<code>'https://jjfan.github.io/jj/'</code>. If this config does not match the URL
|
||||
where you loaded the website, some minor website features (like the
|
||||
version switching widget) will have reduced functionality.</p>
|
||||
<p>Then, the script passes the rest of its arguments to <code>uv run mike
|
||||
deploy</code>, which does the rest of the job. Run <code>uv run mike help deploy</code> to
|
||||
find out what the arguments do.</p>
|
||||
<p>The script sets up a few environment variables and invokes <code>uv run mike deploy</code>
|
||||
with some default arguments and whatever arguments were passed to
|
||||
<code>docs-build-deploy</code>. Run <code>uv run mike help deploy</code> to find out what the
|
||||
arguments do.</p>
|
||||
<p>If you need to do something more complicated, you can use <code>uv run mike
|
||||
...</code> commands. You can also edit the <code>gh-pages</code> bookmark directly, but take care
|
||||
to avoid files that will be overwritten by future invocations of <code>mike</code>. Then,
|
||||
you can submit a PR based on the <code>gh-pages</code> bookmark of
|
||||
<a href="https://martinvonz.github.com/jj">https://martinvonz.github.com/jj</a> (instead of the usual <code>main</code> bookmark).</p>
|
||||
<a href="https://jj-vcs.github.com/jj">https://jj-vcs.github.com/jj</a> (instead of the usual <code>main</code> bookmark).</p>
|
||||
<p>Previously, the version switcher would not work unless the value of the
|
||||
<code>site_url</code> config in <code>mkdocs.yml</code> matched the actual URL the site is being
|
||||
served from. This bug should now be fixed, but if you are not serving the site
|
||||
from https://jj-vcs.github.com/jj and something does not work weirdly, you might
|
||||
want to adjust the <code>site_url</code> to something like <code>https://jjfan.github.io/jj</code>.</p>
|
||||
<h2 id="modifying-protobuffers-this-is-not-common">Modifying protobuffers (this is not common)<a class="headerlink" href="#modifying-protobuffers-this-is-not-common" title="Permanent link">¶</a></h2>
|
||||
<p>Occasionally, you may need to change the <code>.proto</code> files that define jj's data
|
||||
storage format. In this case, you will need to add a few steps to the above
|
||||
@ -2349,10 +2442,10 @@ there.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -883,6 +931,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -908,6 +957,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -929,6 +979,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -988,6 +1040,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1013,6 +1066,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1034,6 +1088,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1055,6 +1110,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1076,6 +1132,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1097,6 +1154,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1118,6 +1176,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1158,6 +1239,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1183,6 +1265,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1204,6 +1287,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1225,6 +1309,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1246,6 +1331,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1267,6 +1353,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1297,6 +1384,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1308,6 +1396,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1545,6 +1634,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1783,6 +1873,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="copy-tracking-and-tracing-design">Copy Tracking and Tracing Design<a class="headerlink" href="#copy-tracking-and-tracing-design" title="Permanent link">¶</a></h1>
|
||||
<p>Authors: <a href="mailto:dploch@google.com">Daniel Ploch</a></p>
|
||||
<p><strong>Summary:</strong> This Document documents an approach to tracking and detecting copy
|
||||
@ -2069,10 +2160,10 @@ file level, one for each copied/moved file.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -883,6 +931,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -908,6 +957,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -929,6 +979,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -988,6 +1040,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1013,6 +1066,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1034,6 +1088,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1055,6 +1110,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1076,6 +1132,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1097,6 +1154,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1118,6 +1176,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1158,6 +1239,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1183,6 +1265,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1213,6 +1296,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1224,6 +1308,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1409,6 +1494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1430,6 +1516,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1451,6 +1538,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1472,6 +1560,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1500,6 +1589,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1693,6 +1783,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="git-submodule-storage">Git submodule storage<a class="headerlink" href="#git-submodule-storage" title="Permanent link">¶</a></h1>
|
||||
<h2 id="objective">Objective<a class="headerlink" href="#objective" title="Permanent link">¶</a></h2>
|
||||
<p>Decide what approach(es) to Git submodule storage we should pursue.
|
||||
@ -1848,10 +1939,10 @@ represent a nested submodule's relationship to its superproject.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
<link rel="canonical" href="https://jj-vcs.github.io/jj/latest/design/git-submodules/">
|
||||
|
||||
|
||||
<link rel="prev" href="../../governance/temporary-voting/">
|
||||
<link rel="prev" href="../../governance/GOVERNANCE/">
|
||||
|
||||
|
||||
<link rel="next" href="../git-submodule-storage/">
|
||||
|
||||
|
||||
<link rel="icon" href="../../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -883,6 +931,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -908,6 +957,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -929,6 +979,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -988,6 +1040,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1013,6 +1066,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1034,6 +1088,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1055,6 +1110,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1076,6 +1132,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1097,6 +1154,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1118,6 +1176,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1158,6 +1239,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1192,6 +1274,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1203,6 +1286,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1439,6 +1523,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1460,6 +1545,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1481,6 +1567,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1502,6 +1589,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1523,6 +1611,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1551,6 +1640,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1795,6 +1885,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="git-submodules">Git submodules<a class="headerlink" href="#git-submodules" title="Permanent link">¶</a></h1>
|
||||
<p>This is an aspirational document that describes how jj <em>will</em> support Git
|
||||
submodules. Readers are assumed to have some familiarity with Git and Git
|
||||
@ -1971,10 +2062,10 @@ amount of design work on its own.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -883,6 +931,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -908,6 +957,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -929,6 +979,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -988,6 +1040,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1013,6 +1066,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1034,6 +1088,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1055,6 +1110,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1076,6 +1132,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1097,6 +1154,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1118,6 +1176,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1158,6 +1239,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1183,6 +1265,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1204,6 +1287,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1234,6 +1318,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1245,6 +1330,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1466,6 +1552,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1487,6 +1574,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1508,6 +1596,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1536,6 +1625,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1765,6 +1855,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="introducing-jj-run">Introducing JJ run<a class="headerlink" href="#introducing-jj-run" title="Permanent link">¶</a></h1>
|
||||
<p>Authors: <a href="mailto:philipmetzger@bluewin.ch">Philip Metzger</a>, <a href="mailto:martinvonz@google.com">Martin von Zweigberk</a>, <a href="mailto:hooper@google.com">Danny Hooper</a>, <a href="mailto:me@waleedkhan.name">Waleed Khan</a></p>
|
||||
<p>Initial Version, 10.12.2022 (view full history <a href="https://docs.google.com/document/d/14BiAoEEy_e-BRPHYpXRFjvHMfgYVKh-pKWzzTDi-v-g/edit">here</a>)</p>
|
||||
@ -2032,10 +2123,10 @@ user and incrementally updating the output of <code>jj st</code>.</li>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -883,6 +931,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -908,6 +957,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -929,6 +979,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -988,6 +1040,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1013,6 +1066,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1034,6 +1088,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1055,6 +1110,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1076,6 +1132,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1097,6 +1154,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1118,6 +1176,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1158,6 +1239,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1183,6 +1265,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1204,6 +1287,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1225,6 +1309,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1255,6 +1340,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1266,6 +1352,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1445,6 +1532,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1466,6 +1554,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1494,6 +1583,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1681,6 +1771,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="sparse-patterns-v2-redesign">Sparse Patterns v2 redesign<a class="headerlink" href="#sparse-patterns-v2-redesign" title="Permanent link">¶</a></h1>
|
||||
<p>Authors: <a href="mailto:dploch@google.com">Daniel Ploch</a></p>
|
||||
<p><strong>Summary:</strong> This Document documents a redesign of the sparse command and
|
||||
@ -1977,10 +2068,10 @@ probably reuse the compact line syntaxes as much as possible for consistency.</p
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -883,6 +931,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -908,6 +957,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -929,6 +979,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -988,6 +1040,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1013,6 +1066,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1034,6 +1088,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1055,6 +1110,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1076,6 +1132,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1097,6 +1154,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1118,6 +1176,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1158,6 +1239,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1183,6 +1265,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1204,6 +1287,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1225,6 +1309,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1246,6 +1331,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1276,6 +1362,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1287,6 +1374,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1517,6 +1605,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1545,6 +1634,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1783,6 +1873,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="remotegit-tracking-branches">Remote/<code>@git</code> tracking branches<a class="headerlink" href="#remotegit-tracking-branches" title="Permanent link">¶</a></h1>
|
||||
<p>This is a plan to implement more Git-like remote tracking branch UX.</p>
|
||||
<h2 id="objective">Objective<a class="headerlink" href="#objective" title="Permanent link">¶</a></h2>
|
||||
@ -2287,10 +2378,10 @@ rolled back for that ref.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -883,6 +931,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -908,6 +957,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -929,6 +979,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -990,6 +1042,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1015,6 +1068,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1036,6 +1090,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1057,6 +1112,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1087,6 +1143,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1098,6 +1155,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1235,6 +1293,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1256,6 +1315,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1294,6 +1376,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1319,6 +1402,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1340,6 +1424,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1361,6 +1446,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1382,6 +1468,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1403,6 +1490,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1424,6 +1512,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1452,6 +1541,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1597,6 +1687,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="title">Title<a class="headerlink" href="#title" title="Permanent link">¶</a></h1>
|
||||
<blockquote>
|
||||
<p>A cool name for your Project</p>
|
||||
@ -1681,10 +1772,10 @@ the discussion.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -883,6 +931,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -908,6 +957,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -929,6 +979,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -990,6 +1042,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1015,6 +1068,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1036,6 +1090,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1066,6 +1121,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1077,6 +1133,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1136,6 +1193,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1157,6 +1215,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1178,6 +1237,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1216,6 +1298,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1241,6 +1324,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1262,6 +1346,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1283,6 +1368,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1304,6 +1390,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1325,6 +1412,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1346,6 +1434,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1374,6 +1463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1441,6 +1531,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="jujutsu-design-docs">Jujutsu Design Docs<a class="headerlink" href="#jujutsu-design-docs" title="Permanent link">¶</a></h1>
|
||||
<p>Jujutsu uses Design Docs to drive technical decisions on large projects and it
|
||||
is the place to discuss your proposed design or new component. It is a very
|
||||
@ -1507,10 +1598,10 @@ Jujutsu, you'll need to go through this process.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -633,6 +649,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -658,6 +675,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -688,6 +706,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -699,6 +718,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -776,6 +796,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -797,6 +818,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -835,6 +857,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -860,6 +883,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -881,6 +927,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -902,6 +949,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -923,6 +971,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -961,6 +1010,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -986,6 +1036,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1007,6 +1058,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1028,6 +1080,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1066,6 +1119,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1091,6 +1145,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1112,6 +1167,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1133,6 +1189,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1154,6 +1211,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1175,6 +1233,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1196,6 +1255,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1234,6 +1316,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1259,6 +1342,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1280,6 +1364,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1301,6 +1386,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1322,6 +1408,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1343,6 +1430,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1364,6 +1452,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1392,6 +1481,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1477,6 +1567,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="filesets">Filesets<a class="headerlink" href="#filesets" title="Permanent link">¶</a></h1>
|
||||
<p>Jujutsu supports a functional language for selecting a set of files.
|
||||
Expressions in this language are called "filesets" (the idea comes from
|
||||
@ -1585,10 +1676,10 @@ expressions.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
1814
latest/git-command-table/index.html
Normal file
1814
latest/git-command-table/index.html
Normal file
File diff suppressed because it is too large
Load Diff
@ -14,11 +14,11 @@
|
||||
<link rel="prev" href="../templates/">
|
||||
|
||||
|
||||
<link rel="next" href="../git-compatibility/">
|
||||
<link rel="next" href="../git-command-table/">
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -759,6 +780,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -793,6 +815,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -804,6 +827,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -849,15 +873,6 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#command-equivalence-table" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Command equivalence table
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
@ -875,12 +890,35 @@
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -902,6 +940,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -923,6 +962,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -961,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -986,6 +1027,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1007,6 +1049,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1028,6 +1071,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1066,6 +1110,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1091,6 +1136,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1112,6 +1158,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1133,6 +1180,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1154,6 +1202,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1175,6 +1224,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1196,6 +1246,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1234,6 +1307,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1259,6 +1333,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1280,6 +1355,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1301,6 +1377,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1322,6 +1399,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1343,6 +1421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1364,6 +1443,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1392,6 +1472,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1451,15 +1532,6 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#command-equivalence-table" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Command equivalence table
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
@ -1477,16 +1549,17 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="comparison-with-git">Comparison with Git<a class="headerlink" href="#comparison-with-git" title="Permanent link">¶</a></h1>
|
||||
<h2 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">¶</a></h2>
|
||||
<p>This document attempts to describe how Jujutsu is different from Git. See
|
||||
<a href="../git-compatibility/">the Git-compatibility doc</a> for information about how
|
||||
the <code>jj</code> command interoperates with Git repos.</p>
|
||||
the <code>jj</code> command interoperates with Git repos. See
|
||||
<a href="../git-command-table/">the Git command table</a> for a table of similar commands.</p>
|
||||
<h2 id="overview">Overview<a class="headerlink" href="#overview" title="Permanent link">¶</a></h2>
|
||||
<p>Here is a list of conceptual differences between Jujutsu and Git, along with
|
||||
links to more details where applicable and available. There's a
|
||||
<a href="#command-equivalence-table">table further down</a> explaining how to achieve
|
||||
various use cases.</p>
|
||||
<a href="../git-command-table/">table</a> explaining how to achieve various use cases.</p>
|
||||
<ul>
|
||||
<li><strong>The working copy is automatically committed.</strong> That results in a simpler and
|
||||
more consistent CLI because the working copy is now treated like any other
|
||||
@ -1556,304 +1629,6 @@ changes into the parent commit, which you might normally use
|
||||
<code>git add -p; git commit --amend</code> for, you can instead use <code>jj squash -i</code> to
|
||||
choose which changes to move into the parent commit, or <code>jj squash <file></code> to
|
||||
move a specific file.</p>
|
||||
<h2 id="command-equivalence-table">Command equivalence table<a class="headerlink" href="#command-equivalence-table" title="Permanent link">¶</a></h2>
|
||||
<p>Note that all <code>jj</code> commands can be run on any commit (not just the working-copy
|
||||
commit), but that's left out of the table to keep it simple. For example,
|
||||
<code>jj squash -r <revision></code> will move the diff from that revision into its
|
||||
parent.</p>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Use case</th>
|
||||
<th>Jujutsu command</th>
|
||||
<th>Git command</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Create a new repo</td>
|
||||
<td><code>jj git init [--colocate]</code></td>
|
||||
<td><code>git init</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Clone an existing repo</td>
|
||||
<td><code>jj git clone <source> <destination> [--remote <remote name>]</code> (there is no support
|
||||
for cloning non-Git repos yet)</td>
|
||||
<td><code>git clone <source> <destination> [--origin <remote name>]</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<!-- TODO: Mention that you might need to do a `jj bookmark track branch@remote`
|
||||
-- to see the bookmark in `jj log`
|
||||
-->
|
||||
<td>Update the local repo with all bookmarks/branches from a remote</td>
|
||||
<td><code>jj git fetch [--remote <remote>]</code> (there is no
|
||||
support for fetching into non-Git repos yet)</td>
|
||||
<td><code>git fetch [<remote>]</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<!-- TODO: This only affects tracked branches now -->
|
||||
<td>Update a remote repo with all bookmarks/branches from the local repo</td>
|
||||
<td><code>jj git push --all [--remote <remote>]</code> (there is no
|
||||
support for pushing from non-Git repos yet)</td>
|
||||
<td><code>git push --all [<remote>]</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Update a remote repo with a single bookmark from the local repo</td>
|
||||
<td><code>jj git push --bookmark <bookmark name>
|
||||
[--remote <remote>]</code> (there is no support for
|
||||
pushing from non-Git repos yet)</td>
|
||||
<td><code>git push <remote> <bookmark name></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Add a remote target to the repo</td>
|
||||
<td><code>jj git remote add <remote> <url></code></td>
|
||||
<td><code>git remote add <remote> <url></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Show summary of current work and repo status</td>
|
||||
<td><code>jj st</code></td>
|
||||
<td><code>git status</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Show diff of the current change</td>
|
||||
<td><code>jj diff</code></td>
|
||||
<td><code>git diff HEAD</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Show diff of another change</td>
|
||||
<td><code>jj diff -r <revision></code></td>
|
||||
<td><code>git diff <revision>^ <revision></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Show diff from another change to the current change</td>
|
||||
<td><code>jj diff --from <revision></code></td>
|
||||
<td><code>git diff <revision></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Show diff from change A to change B</td>
|
||||
<td><code>jj diff --from A --to B</code></td>
|
||||
<td><code>git diff A B</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr>
|
||||
<td>Show description and diff of a change</td>
|
||||
<td><code>jj show <revision></code></td>
|
||||
<td><code>git show <revision></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Add a file to the current change</td>
|
||||
<td><code>touch filename</code></td>
|
||||
<td><code>touch filename; git add filename</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Remove a file from the current change</td>
|
||||
<td><code>rm filename</code></td>
|
||||
<td><code>git rm filename</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Modify a file in the current change</td>
|
||||
<td><code>echo stuff >> filename</code></td>
|
||||
<td><code>echo stuff >> filename</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Finish work on the current change and start a new change</td>
|
||||
<td><code>jj commit</code></td>
|
||||
<td><code>git commit -a</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>See log of ancestors of the current commit</td>
|
||||
<td><code>jj log -r ::@</code></td>
|
||||
<td><code>git log --oneline --graph --decorate</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>See log of all reachable commits</td>
|
||||
<td><code>jj log -r 'all()'</code> or <code>jj log -r ::</code></td>
|
||||
<td><code>git log --oneline --graph --decorate --branches</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Show log of commits not on the main bookmark</td>
|
||||
<td><code>jj log</code></td>
|
||||
<td>(TODO)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>List versioned files in the working copy</td>
|
||||
<td><code>jj file list</code></td>
|
||||
<td><code>git ls-files --cached</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Search among files versioned in the repository</td>
|
||||
<td><code>grep foo $(jj file list)</code>, or <code>rg --no-require-git foo</code></td>
|
||||
<td><code>git grep foo</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Abandon the current change and start a new change</td>
|
||||
<td><code>jj abandon</code></td>
|
||||
<td><code>git reset --hard</code> (cannot be undone)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Make the current change empty</td>
|
||||
<td><code>jj restore</code></td>
|
||||
<td><code>git reset --hard</code> (same as abandoning a change since Git
|
||||
has no concept of a "change")</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Abandon the parent of the working copy, but keep its diff in the working copy</td>
|
||||
<td><code>jj squash --from @-</code></td>
|
||||
<td><code>git reset --soft HEAD~</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Discard working copy changes in some files</td>
|
||||
<td><code>jj restore <paths>...</code></td>
|
||||
<td><code>git restore <paths>...</code> or <code>git checkout HEAD -- <paths>...</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Edit description (commit message) of the current change</td>
|
||||
<td><code>jj describe</code></td>
|
||||
<td>Not supported</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Edit description (commit message) of the previous change</td>
|
||||
<td><code>jj describe @-</code></td>
|
||||
<td><code>git commit --amend --only</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Temporarily put away the current change</td>
|
||||
<td><code>jj new @-</code> (the old working-copy commit remains as a sibling commit)<br />
|
||||
(the old working-copy commit X can be restored with <code>jj edit X</code>)</td>
|
||||
<td><code>git stash</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Start working on a new change based on the <main> bookmark/branch</td>
|
||||
<td><code>jj new main</code></td>
|
||||
<td><code>git switch -c topic main</code> or
|
||||
<code>git checkout -b topic main</code> (may need to stash or commit
|
||||
first)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move bookmark/branch A onto bookmark/branch B</td>
|
||||
<td><code>jj rebase -b A -d B</code></td>
|
||||
<td><code>git rebase B A</code>
|
||||
(may need to rebase other descendant branches separately)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move change A and its descendants onto change B</td>
|
||||
<td><code>jj rebase -s A -d B</code></td>
|
||||
<td><code>git rebase --onto B A^ <some descendant bookmark></code>
|
||||
(may need to rebase other descendant bookmarks separately)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Reorder changes from A-B-C-D to A-C-B-D</td>
|
||||
<td><code>jj rebase -r C --before B</code></td>
|
||||
<td><code>git rebase -i A</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move the diff in the current change into the parent change</td>
|
||||
<td><code>jj squash</code></td>
|
||||
<td><code>git commit --amend -a</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Interactively move part of the diff in the current change into the
|
||||
parent change</td>
|
||||
<td><code>jj squash -i</code></td>
|
||||
<td><code>git add -p; git commit --amend</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move the diff in the working copy into an ancestor</td>
|
||||
<td><code>jj squash --into X</code></td>
|
||||
<td><code>git commit --fixup=X; git rebase -i --autosquash X^</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Interactively move part of the diff in an arbitrary change to another
|
||||
arbitrary change</td>
|
||||
<td><code>jj squash -i --from X --into Y</code></td>
|
||||
<td>Not supported</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Interactively split the changes in the working copy in two</td>
|
||||
<td><code>jj split</code></td>
|
||||
<td><code>git commit -p</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Interactively split an arbitrary change in two</td>
|
||||
<td><code>jj split -r <revision></code></td>
|
||||
<td>Not supported (can be emulated with the "edit" action in
|
||||
<code>git rebase -i</code>)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Interactively edit the diff in a given change</td>
|
||||
<td><code>jj diffedit -r <revision></code></td>
|
||||
<td>Not supported (can be emulated with the "edit" action in
|
||||
<code>git rebase -i</code>)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Resolve conflicts and continue interrupted operation</td>
|
||||
<td><code>echo resolved > filename; jj squash</code> (operations
|
||||
don't get interrupted, so no need to continue)</td>
|
||||
<td><code>echo resolved > filename; git add filename; git
|
||||
rebase/merge/cherry-pick --continue</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Create a copy of a commit on top of another commit</td>
|
||||
<td><code>jj duplicate <source> -d <destination></code></td>
|
||||
<td><code>git co <destination>; git cherry-pick <source></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Find the root of the working copy (or check if in a repo)</td>
|
||||
<td><code>jj workspace root</code></td>
|
||||
<td><code>git rev-parse --show-toplevel</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>List bookmarks/branches</td>
|
||||
<td><code>jj bookmark list</code> or <code>jj b l</code> for short</td>
|
||||
<td><code>git branch</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Create a bookmark/branch</td>
|
||||
<td><code>jj bookmark create <name> -r <revision></code></td>
|
||||
<td><code>git branch <name> <revision></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move a bookmark/branch forward</td>
|
||||
<td><code>jj bookmark move <name> --to <revision></code>
|
||||
or <code>jj b m <name> --to <revision></code> for short</td>
|
||||
<td><code>git branch -f <name> <revision></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move a bookmark/branch backward or sideways</td>
|
||||
<td><code>jj bookmark move <name> --to <revision> --allow-backwards</code></td>
|
||||
<td><code>git branch -f <name> <revision></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Delete a bookmark/branch</td>
|
||||
<td><code>jj bookmark delete <name> </code></td>
|
||||
<td><code>git branch --delete <name></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>See log of operations performed on the repo</td>
|
||||
<td><code>jj op log</code></td>
|
||||
<td>Not supported</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Undo an earlier operation</td>
|
||||
<td><code>jj [op] undo <operation ID></code>
|
||||
(<code>jj undo</code> is an alias for <code>jj op undo</code>)
|
||||
</td>
|
||||
<td>Not supported</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Create a commit that cancels out a previous commit</td>
|
||||
<td><code>jj backout -r <revision></code>
|
||||
</td>
|
||||
<td><code>git revert <revision></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Show what revision and author last modified each line of a file</td>
|
||||
<td><code>jj file annotate <path></code>
|
||||
</td>
|
||||
<td><code>git blame <file></code></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
|
||||
@ -1900,10 +1675,10 @@ parent.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
<link rel="canonical" href="https://jj-vcs.github.io/jj/latest/git-compatibility/">
|
||||
|
||||
|
||||
<link rel="prev" href="../git-comparison/">
|
||||
<link rel="prev" href="../git-command-table/">
|
||||
|
||||
|
||||
<link rel="next" href="../sapling-comparison/">
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -759,6 +780,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -784,6 +806,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -814,6 +859,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -825,6 +871,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -944,6 +991,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -965,6 +1013,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1003,6 +1052,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1028,6 +1078,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1049,6 +1100,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1070,6 +1122,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1108,6 +1161,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1133,6 +1187,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1154,6 +1209,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1175,6 +1231,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1196,6 +1253,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1217,6 +1275,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1238,6 +1297,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1276,6 +1358,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1301,6 +1384,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1322,6 +1406,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1343,6 +1428,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1364,6 +1450,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1385,6 +1472,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1406,6 +1494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1434,6 +1523,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1561,6 +1651,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="git-compatibility">Git compatibility<a class="headerlink" href="#git-compatibility" title="Permanent link">¶</a></h1>
|
||||
<p>Jujutsu has two backends for storing commits. One of them uses a regular Git
|
||||
repo, which means that you can collaborate with Git users without them even
|
||||
@ -1583,9 +1674,10 @@ a comparison with Git, including how workflows are different, see the
|
||||
<li><code>core.excludesFile</code></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><strong>Authentication: Partial.</strong> Only <code>ssh-agent</code>, a password-less key (
|
||||
only <code>~/.ssh/id_rsa</code>, <code>~/.ssh/id_ed25519</code> or <code>~/.ssh/id_ed25519_sk</code>), or
|
||||
a <code>credential.helper</code>.</li>
|
||||
<li><strong>Authentication: Yes.</strong> With the default authentication scheme, which uses
|
||||
<code>git</code> under the hood. With <code>git.subprocess = false</code>, only <code>ssh-agent</code>, a
|
||||
password-less key (only <code>~/.ssh/id_rsa</code>, <code>~/.ssh/id_ed25519</code> or
|
||||
<code>~/.ssh/id_ed25519_sk</code>), or a <code>credential.helper</code> are supported.</li>
|
||||
<li><strong>Branches: Yes.</strong> You can read more about
|
||||
<a href="../bookmarks/">how branches work in Jujutsu</a>
|
||||
and <a href="#branches">how they interoperate with Git</a>.</li>
|
||||
@ -1806,10 +1898,10 @@ replaced all the other paths in your repo. You will probably want to run
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -280,6 +281,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -305,6 +307,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -326,6 +329,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -356,6 +360,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -367,6 +372,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -555,6 +561,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -583,6 +590,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -603,6 +611,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -623,6 +632,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -643,6 +653,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -673,6 +684,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +710,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +732,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -740,6 +754,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -761,6 +776,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +798,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -820,6 +837,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +863,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -866,6 +885,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -887,6 +907,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -908,6 +929,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -946,6 +968,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -971,6 +994,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -992,6 +1038,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1013,6 +1060,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1034,6 +1082,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1072,6 +1121,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1097,6 +1147,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1118,6 +1169,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1139,6 +1191,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1177,6 +1230,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1202,6 +1256,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1223,6 +1278,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1244,6 +1300,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1265,6 +1322,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1286,6 +1344,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1307,6 +1366,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1345,6 +1427,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1370,6 +1453,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1391,6 +1475,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1412,6 +1497,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1433,6 +1519,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1454,6 +1541,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1475,6 +1563,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1503,6 +1592,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1699,6 +1789,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="using-jujutsu-with-github-and-gitlab-projects">Using Jujutsu with GitHub and GitLab Projects<a class="headerlink" href="#using-jujutsu-with-github-and-gitlab-projects" title="Permanent link">¶</a></h1>
|
||||
<p>This guide assumes a basic understanding of either Git or Mercurial.</p>
|
||||
<h2 id="set-up-an-ssh-key">Set up an SSH key<a class="headerlink" href="#set-up-an-ssh-key" title="Permanent link">¶</a></h2>
|
||||
@ -1953,10 +2044,10 @@ e.g. <a href="https://jg.gg/2018/09/29/stacked-diffs-versus-pull-requests/">this
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -486,6 +496,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -511,6 +522,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -532,6 +544,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -553,6 +566,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -574,6 +588,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -604,6 +619,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -615,6 +631,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -925,6 +942,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +968,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -971,6 +990,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -992,6 +1012,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1013,6 +1034,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1051,6 +1073,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1076,6 +1099,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1097,6 +1143,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1118,6 +1165,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1139,6 +1187,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1177,6 +1226,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1202,6 +1252,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1223,6 +1274,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1244,6 +1296,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1282,6 +1335,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1307,6 +1361,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1328,6 +1383,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1349,6 +1405,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1370,6 +1427,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1391,6 +1449,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1412,6 +1471,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1450,6 +1532,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1475,6 +1558,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1496,6 +1580,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1517,6 +1602,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1538,6 +1624,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1559,6 +1646,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1580,6 +1668,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1608,6 +1697,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1909,6 +1999,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="glossary">Glossary<a class="headerlink" href="#glossary" title="Permanent link">¶</a></h1>
|
||||
<h2 id="anonymous-branch">Anonymous branch<a class="headerlink" href="#anonymous-branch" title="Permanent link">¶</a></h2>
|
||||
<p>An anonymous branch is a chain of commits that doesn't necessarily have any
|
||||
@ -2131,10 +2222,10 @@ commits are tracked in the <a href="#operation-log">operation log</a>.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
1849
latest/governance/GOVERNANCE/index.html
Normal file
1849
latest/governance/GOVERNANCE/index.html
Normal file
File diff suppressed because it is too large
Load Diff
@ -14,11 +14,11 @@
|
||||
<link rel="prev" href="../../releasing/">
|
||||
|
||||
|
||||
<link rel="next" href="../../design/git-submodules/">
|
||||
<link rel="next" href="../GOVERNANCE/">
|
||||
|
||||
|
||||
<link rel="icon" href="../../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -883,6 +931,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -908,6 +957,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -929,6 +979,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -990,6 +1042,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1015,6 +1068,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1036,6 +1090,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1057,6 +1112,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1078,6 +1134,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1099,6 +1156,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1129,6 +1187,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1140,6 +1199,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1247,6 +1307,28 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
@ -1276,6 +1358,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1301,6 +1384,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1322,6 +1406,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1343,6 +1428,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1364,6 +1450,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1385,6 +1472,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1406,6 +1494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1434,6 +1523,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1561,6 +1651,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="getting-community-buy-in-for-working-group-proposals">Getting Community Buy-in for Working Group Proposals<a class="headerlink" href="#getting-community-buy-in-for-working-group-proposals" title="Permanent link">¶</a></h1>
|
||||
<h2 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">¶</a></h2>
|
||||
<p>We're introducing a temporary process to describe how we'll gain approval to
|
||||
@ -1765,10 +1856,10 @@ may reuse some of all of this process to figure out how to move forward.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
This license applies to favicon.ico:
|
||||
This license applies to favicon-96x96.png and jj-logo.png:
|
||||
|
||||
This work © 2025 by J. Jennings is licensed under Creative Commons Attribution 4.0 International
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 4.5 KiB |
BIN
latest/images/jj-logo.png
Normal file
BIN
latest/images/jj-logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 50 KiB |
@ -16,7 +16,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -255,6 +255,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -266,6 +267,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -334,6 +336,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -359,6 +362,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -380,6 +384,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -401,6 +406,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -422,6 +428,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -450,6 +457,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -470,6 +478,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -490,6 +499,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -510,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -540,6 +551,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -565,6 +577,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -586,6 +599,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -607,6 +621,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -628,6 +643,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -649,6 +665,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -687,6 +704,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -712,6 +730,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -733,6 +752,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -754,6 +774,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -775,6 +796,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -813,6 +835,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -838,6 +861,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -859,6 +905,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -880,6 +927,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -901,6 +949,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -939,6 +988,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -964,6 +1014,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -985,6 +1036,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1006,6 +1058,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1044,6 +1097,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1069,6 +1123,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1090,6 +1145,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1111,6 +1167,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1132,6 +1189,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1153,6 +1211,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1174,6 +1233,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1212,6 +1294,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1237,6 +1320,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1258,6 +1342,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1279,6 +1364,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1300,6 +1386,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1321,6 +1408,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1342,6 +1430,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1370,6 +1459,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1437,7 +1527,12 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="jujutsua-version-control-system">Jujutsu—a version control system<a class="headerlink" href="#jujutsua-version-control-system" title="Permanent link">¶</a></h1>
|
||||
<figure>
|
||||
<img title="jj logo" src="images/jj-logo.png" width=40%>
|
||||
</figure>
|
||||
|
||||
<h2 id="welcome-to-jjs-documentation-website">Welcome to <code>jj</code>'s documentation website!<a class="headerlink" href="#welcome-to-jjs-documentation-website" title="Permanent link">¶</a></h2>
|
||||
<!-- This only applies to the website, not to the GitHub interface -->
|
||||
<p>The complete list of the available documentation pages is located in
|
||||
@ -1506,10 +1601,10 @@ on the hamburger menu that appears in this situation.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -280,6 +281,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -314,6 +316,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -325,6 +328,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -675,6 +679,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -696,6 +701,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -717,6 +723,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -745,6 +752,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -765,6 +773,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -785,6 +794,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -805,6 +815,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -835,6 +846,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -860,6 +872,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -881,6 +894,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -902,6 +916,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -923,6 +938,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -944,6 +960,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -982,6 +999,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1007,6 +1025,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1028,6 +1047,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1049,6 +1069,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1070,6 +1091,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1108,6 +1130,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1133,6 +1156,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1154,6 +1200,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1175,6 +1222,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1196,6 +1244,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1234,6 +1283,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1259,6 +1309,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1280,6 +1331,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1301,6 +1353,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1339,6 +1392,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1364,6 +1418,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1385,6 +1440,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1406,6 +1462,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1427,6 +1484,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1448,6 +1506,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1469,6 +1528,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1507,6 +1589,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1532,6 +1615,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1553,6 +1637,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1574,6 +1659,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1595,6 +1681,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1616,6 +1703,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1637,6 +1725,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1665,6 +1754,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -2023,6 +2113,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="installation-and-setup">Installation and setup<a class="headerlink" href="#installation-and-setup" title="Permanent link">¶</a></h1>
|
||||
<h2 id="installation">Installation<a class="headerlink" href="#installation" title="Permanent link">¶</a></h2>
|
||||
<h3 id="download-pre-built-binaries-for-a-release">Download pre-built binaries for a release<a class="headerlink" href="#download-pre-built-binaries-for-a-release" title="Permanent link">¶</a></h3>
|
||||
@ -2244,10 +2335,10 @@ use completions-jj.nu * # Or `source completions-jj.nu`
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -486,6 +496,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -511,6 +522,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -532,6 +544,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -553,6 +566,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -583,6 +597,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -594,6 +609,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -662,6 +678,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -700,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -725,6 +743,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -746,6 +765,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -767,6 +787,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -788,6 +809,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -826,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -851,6 +874,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -872,6 +918,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -893,6 +940,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -914,6 +962,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -952,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -977,6 +1027,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -998,6 +1049,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1019,6 +1071,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1057,6 +1110,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1082,6 +1136,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1103,6 +1158,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1124,6 +1180,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1145,6 +1202,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1166,6 +1224,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1187,6 +1246,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1225,6 +1307,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1250,6 +1333,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1271,6 +1355,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1292,6 +1377,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1313,6 +1399,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1334,6 +1421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1355,6 +1443,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1383,6 +1472,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1459,6 +1549,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="operation-log">Operation log<a class="headerlink" href="#operation-log" title="Permanent link">¶</a></h1>
|
||||
<h2 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">¶</a></h2>
|
||||
<p>Jujutsu records each operation that modifies the repo in the "operation log".
|
||||
@ -1558,10 +1649,10 @@ than to simulate concurrent commands.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
1547
latest/paid_contributors/index.html
Normal file
1547
latest/paid_contributors/index.html
Normal file
File diff suppressed because it is too large
Load Diff
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -759,6 +780,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -784,6 +806,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -805,6 +850,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -826,6 +872,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -856,6 +903,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -895,6 +943,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -920,6 +969,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -941,6 +991,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -962,6 +1013,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1000,6 +1052,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1025,6 +1078,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1046,6 +1100,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1067,6 +1122,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1088,6 +1144,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1109,6 +1166,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1130,6 +1188,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1168,6 +1249,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1193,6 +1275,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1214,6 +1297,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1235,6 +1319,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1256,6 +1341,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1277,6 +1363,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1298,6 +1385,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1326,6 +1414,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1367,6 +1456,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="related-work">Related work<a class="headerlink" href="#related-work" title="Permanent link">¶</a></h1>
|
||||
<p>Similar tools:</p>
|
||||
<ul>
|
||||
@ -1438,10 +1528,10 @@
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -883,6 +931,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -908,6 +957,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -929,6 +979,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +1001,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -990,6 +1042,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1015,6 +1068,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1036,6 +1090,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1057,6 +1112,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1078,6 +1134,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1108,6 +1165,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1119,6 +1177,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1187,6 +1246,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1225,6 +1307,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1250,6 +1333,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1271,6 +1355,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1292,6 +1377,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1313,6 +1399,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1334,6 +1421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1355,6 +1443,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1383,6 +1472,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1459,6 +1549,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="how-to-do-a-release">How to do a release<a class="headerlink" href="#how-to-do-a-release" title="Permanent link">¶</a></h1>
|
||||
<h2 id="update-changelog-and-cargo-versions">Update changelog and Cargo versions<a class="headerlink" href="#update-changelog-and-cargo-versions" title="Permanent link">¶</a></h2>
|
||||
<p>Send a PR similar to https://github.com/jj-vcs/jj/pull/5215. Feel free to
|
||||
@ -1470,7 +1561,14 @@ copy-edit the changelog in order to:</p>
|
||||
</ul>
|
||||
<p>Producing the list of contributors is a bit annoying. The current suggestion is
|
||||
to run something like this:</p>
|
||||
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>log<span class="w"> </span>--no-graph<span class="w"> </span>-r<span class="w"> </span><span class="s1">'heads(tags())..main'</span><span class="w"> </span>-T<span class="w"> </span><span class="s1">'author ++ "\n"'</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span><span class="p">|</span><span class="w"> </span>uniq<span class="w"> </span>-c
|
||||
<div class="highlight"><pre><span></span><code><span class="nv">root</span><span class="o">=</span>v0.25.0
|
||||
<span class="k">for</span><span class="w"> </span>i<span class="w"> </span><span class="k">in</span><span class="w"> </span><span class="k">$(</span>seq<span class="w"> </span><span class="m">5</span><span class="k">)</span><span class="p">;</span><span class="w"> </span><span class="k">do</span>
|
||||
<span class="w"> </span>gh<span class="w"> </span>api<span class="w"> </span><span class="s2">"/repos/jj-vcs/jj/compare/</span><span class="nv">$root</span><span class="s2">...main?per_page=100;page=</span><span class="nv">$i</span><span class="s2">"</span>
|
||||
<span class="k">done</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>jq<span class="w"> </span>-r<span class="w"> </span><span class="s1">'.commits[] | "* " + .commit.author.name + " (@" + .author.login + ")"'</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span>-fu
|
||||
</code></pre></div>
|
||||
<p>https://docs.github.com/en/rest/commits/commits?apiVersion=2022-11-28#compare-two-commits</p>
|
||||
<p>Alternatively, the list can be produced locally:</p>
|
||||
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>log<span class="w"> </span>--no-graph<span class="w"> </span>-r<span class="w"> </span><span class="s1">'heads(tags())..main'</span><span class="w"> </span>-T<span class="w"> </span><span class="s1">'"* " ++ author ++ "\n"'</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span>-fu
|
||||
</code></pre></div>
|
||||
<p>Then try to find the right GitHub username for each person and copy their name
|
||||
and username from the GitHub page for the person
|
||||
@ -1558,10 +1656,10 @@ jj<span class="w"> </span>new<span class="w"> </span>v0.<number>.0
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -633,6 +649,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -658,6 +675,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -679,6 +697,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -709,6 +728,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -720,6 +740,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -863,6 +884,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -901,6 +923,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -926,6 +949,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -947,6 +993,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -968,6 +1015,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -989,6 +1037,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1027,6 +1076,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1052,6 +1102,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1073,6 +1124,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1094,6 +1146,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1132,6 +1185,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1157,6 +1211,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1178,6 +1233,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1199,6 +1255,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1220,6 +1277,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1241,6 +1299,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1262,6 +1321,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1300,6 +1382,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1325,6 +1408,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1346,6 +1430,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1367,6 +1452,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1388,6 +1474,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1409,6 +1496,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1430,6 +1518,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1458,6 +1547,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1609,6 +1699,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="revsets">Revsets<a class="headerlink" href="#revsets" title="Permanent link">¶</a></h1>
|
||||
<p>Jujutsu supports a functional language for selecting a set of revisions.
|
||||
Expressions in this language are called "revsets" (the idea comes from
|
||||
@ -2214,10 +2305,10 @@ description:</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -246,6 +246,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -276,6 +277,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -301,6 +303,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -322,6 +325,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -343,6 +347,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -364,6 +369,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -392,6 +398,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -412,6 +419,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -432,6 +440,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -452,6 +461,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -482,6 +492,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -507,6 +518,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -528,6 +540,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -549,6 +562,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -570,6 +584,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -591,6 +606,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -629,6 +645,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -654,6 +671,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -675,6 +693,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -696,6 +715,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -717,6 +737,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -755,6 +776,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -780,6 +802,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -801,6 +846,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -822,6 +868,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -843,6 +890,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -881,6 +929,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -906,6 +955,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -927,6 +977,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -948,6 +999,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -986,6 +1038,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1011,6 +1064,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1032,6 +1086,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1053,6 +1108,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1074,6 +1130,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1095,6 +1152,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1116,6 +1174,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1154,6 +1235,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1179,6 +1261,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1200,6 +1283,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1221,6 +1305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1242,6 +1327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1263,6 +1349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1284,6 +1371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1321,6 +1409,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1332,6 +1421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1545,6 +1635,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="roadmap">Roadmap<a class="headerlink" href="#roadmap" title="Permanent link">¶</a></h1>
|
||||
<p>This documents some of the goals we have. Many of them are quite independent.</p>
|
||||
<blockquote>
|
||||
@ -1653,10 +1744,10 @@ future cloud-based server using the same model as <a href="https://web.archive.o
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -759,6 +780,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -784,6 +806,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -805,6 +850,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -835,6 +881,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -846,6 +893,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -905,6 +953,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -943,6 +992,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -968,6 +1018,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -989,6 +1040,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1010,6 +1062,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1048,6 +1101,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1073,6 +1127,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1094,6 +1149,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1115,6 +1171,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1136,6 +1193,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1157,6 +1215,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1178,6 +1237,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1216,6 +1298,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1241,6 +1324,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1262,6 +1346,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1283,6 +1368,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1304,6 +1390,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1325,6 +1412,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1346,6 +1434,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1374,6 +1463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1441,6 +1531,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="comparison-with-sapling">Comparison with Sapling<a class="headerlink" href="#comparison-with-sapling" title="Permanent link">¶</a></h1>
|
||||
<h2 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">¶</a></h2>
|
||||
<p>This document attempts to describe how jj is different
|
||||
@ -1568,10 +1659,10 @@ tools, such as:</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -2,154 +2,166 @@
|
||||
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/FAQ/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/bookmarks/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/cli-reference/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/code-of-conduct/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/community_tools/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/config/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/conflicts/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/contributing/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/design_doc_blueprint/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/design_docs/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/filesets/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/git-command-table/</loc>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/git-comparison/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/git-compatibility/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/github/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/glossary/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/install-and-setup/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/operation-log/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/paid_contributors/</loc>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/related-work/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/releasing/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/revsets/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/roadmap/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/sapling-comparison/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/templates/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/testimonials/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/tutorial/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/windows/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/working-copy/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/design/copy-tracking/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/design/git-submodule-storage/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/design/git-submodules/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/design/run/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/design/sparse-v2/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/design/tracking-branches/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/governance/GOVERNANCE/</loc>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/governance/temporary-voting/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/technical/architecture/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/technical/concurrency/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://jj-vcs.github.io/jj/latest/technical/conflicts/</loc>
|
||||
<lastmod>2025-02-06</lastmod>
|
||||
<lastmod>2025-03-05</lastmod>
|
||||
</url>
|
||||
</urlset>
|
||||
Binary file not shown.
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -885,6 +933,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -919,6 +968,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -930,6 +980,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1181,6 +1232,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1202,6 +1254,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1240,6 +1293,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1265,6 +1319,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1286,6 +1341,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1307,6 +1363,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1328,6 +1385,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1349,6 +1407,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1370,6 +1429,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1408,6 +1490,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1433,6 +1516,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1454,6 +1538,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1475,6 +1560,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1496,6 +1582,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1517,6 +1604,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1538,6 +1626,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1566,6 +1655,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1825,6 +1915,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="architecture">Architecture<a class="headerlink" href="#architecture" title="Permanent link">¶</a></h1>
|
||||
<h2 id="data-model">Data model<a class="headerlink" href="#data-model" title="Permanent link">¶</a></h2>
|
||||
<p>The commit data model is similar
|
||||
@ -2046,10 +2137,10 @@ upgrades of the repo format <a class="footnote-backref" href="#fnref:1" tit
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -885,6 +933,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -910,6 +959,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -940,6 +990,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -951,6 +1002,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1049,6 +1101,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1087,6 +1140,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1112,6 +1166,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1133,6 +1188,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1154,6 +1210,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1175,6 +1232,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1196,6 +1254,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1217,6 +1276,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1255,6 +1337,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1280,6 +1363,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1301,6 +1385,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1322,6 +1407,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1343,6 +1429,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1364,6 +1451,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1385,6 +1473,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1413,6 +1502,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1519,6 +1609,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="concurrency">Concurrency<a class="headerlink" href="#concurrency" title="Permanent link">¶</a></h1>
|
||||
<h2 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">¶</a></h2>
|
||||
<p>Concurrent editing is a key feature of DVCSs -- that's why they're called
|
||||
@ -1670,10 +1761,10 @@ This scheme ensures that transactions are atomic.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -631,6 +647,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -656,6 +673,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -677,6 +695,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +717,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -719,6 +739,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -757,6 +778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -782,6 +804,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -803,6 +848,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +870,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -845,6 +892,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -885,6 +933,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -910,6 +959,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -931,6 +981,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -961,6 +1012,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -972,6 +1024,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1057,6 +1110,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1082,6 +1136,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1103,6 +1158,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1124,6 +1180,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1145,6 +1202,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1166,6 +1224,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1187,6 +1246,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1225,6 +1307,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1250,6 +1333,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1271,6 +1355,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1292,6 +1377,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1313,6 +1399,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1334,6 +1421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1355,6 +1443,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1383,6 +1472,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1459,6 +1549,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="first-class-conflicts">First-class conflicts<a class="headerlink" href="#first-class-conflicts" title="Permanent link">¶</a></h1>
|
||||
<h2 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">¶</a></h2>
|
||||
<p>Conflicts can happen when two changes are applied to some state. This document
|
||||
@ -1557,10 +1648,10 @@ which we can simplify to just <code>A</code> (i.e. no conflict).</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -484,6 +494,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -509,6 +520,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -530,6 +542,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +564,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -572,6 +586,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -593,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -633,6 +649,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -658,6 +675,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -679,6 +697,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -700,6 +719,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -730,6 +750,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -741,6 +762,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -822,6 +844,15 @@
|
||||
<nav class="md-nav" aria-label="Types">
|
||||
<ul class="md-nav__list">
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#annotationline-type" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
AnnotationLine type
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#boolean-type" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
@ -1123,6 +1154,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1148,6 +1180,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1169,6 +1224,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1190,6 +1246,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1211,6 +1268,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1249,6 +1307,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1274,6 +1333,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1295,6 +1355,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1316,6 +1377,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1354,6 +1416,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1379,6 +1442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1400,6 +1464,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1421,6 +1486,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1442,6 +1508,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1463,6 +1530,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1484,6 +1552,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1522,6 +1613,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1547,6 +1639,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1568,6 +1661,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1589,6 +1683,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1610,6 +1705,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1631,6 +1727,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1652,6 +1749,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1680,6 +1778,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1775,6 +1874,15 @@
|
||||
<nav class="md-nav" aria-label="Types">
|
||||
<ul class="md-nav__list">
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#annotationline-type" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
AnnotationLine type
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#boolean-type" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
@ -2053,6 +2161,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="templates">Templates<a class="headerlink" href="#templates" title="Permanent link">¶</a></h1>
|
||||
<p>Jujutsu supports a functional language to customize output of commands.
|
||||
The language consists of literals, keywords, operators, functions, and
|
||||
@ -2102,10 +2211,14 @@ type</a> are available as keywords. For example,
|
||||
content by adding both leading and trailing fill characters. If an odd number
|
||||
of fill characters are needed, the trailing fill will be one longer than the
|
||||
leading fill. The <code>content</code> shouldn't have newline characters.</li>
|
||||
<li><code>truncate_start(width: Integer, content: Template)</code>: Truncate <code>content</code> by
|
||||
removing leading characters. The <code>content</code> shouldn't have newline character.</li>
|
||||
<li><code>truncate_end(width: Integer, content: Template)</code>: Truncate <code>content</code> by
|
||||
removing trailing characters. The <code>content</code> shouldn't have newline character.</li>
|
||||
<li><code>truncate_start(width: Integer, content: Template[, ellipsis: Template])</code>:
|
||||
Truncate <code>content</code> by removing leading characters. The <code>content</code> shouldn't
|
||||
have newline character. If <code>ellipsis</code> is provided and <code>content</code> was truncated,
|
||||
prepend the <code>ellipsis</code> to the result.</li>
|
||||
<li><code>truncate_end(width: Integer, content: Template[, ellipsis: Template])</code>:
|
||||
Truncate <code>content</code> by removing trailing characters. The <code>content</code> shouldn't
|
||||
have newline character. If <code>ellipsis</code> is provided and <code>content</code> was truncated,
|
||||
append the <code>ellipsis</code> to the result.</li>
|
||||
<li><code>label(label: Template, content: Template) -> Template</code>: Apply label to
|
||||
the content. The <code>label</code> is evaluated as a space-separated string.</li>
|
||||
<li><code>raw_escape_sequence(content: Template) -> Template</code>: Preserves any escape
|
||||
@ -2113,6 +2226,8 @@ type</a> are available as keywords. For example,
|
||||
Note: This function is intended for escape sequences and as such, its output
|
||||
is expected to be invisible / of no display width. Outputting content with
|
||||
nonzero display width may break wrapping, indentation etc.</li>
|
||||
<li><code>stringify(content: Template) -> String</code>: Format <code>content</code> to string. This
|
||||
effectively removes color labels.</li>
|
||||
<li><code>if(condition: Boolean, then: Template[, else: Template]) -> Template</code>:
|
||||
Conditionally evaluate <code>then</code>/<code>else</code> template content.</li>
|
||||
<li><code>coalesce(content: Template...) -> Template</code>: Returns the first <strong>non-empty</strong>
|
||||
@ -2126,6 +2241,15 @@ type</a> are available as keywords. For example,
|
||||
<li><code>config(name: String) -> ConfigValue</code>: Look up configuration value by <code>name</code>.</li>
|
||||
</ul>
|
||||
<h2 id="types">Types<a class="headerlink" href="#types" title="Permanent link">¶</a></h2>
|
||||
<h3 id="annotationline-type">AnnotationLine type<a class="headerlink" href="#annotationline-type" title="Permanent link">¶</a></h3>
|
||||
<p>The following methods are defined.</p>
|
||||
<ul>
|
||||
<li><code>.commit() -> Commit</code>: Commit responsible for changing the relevant line.</li>
|
||||
<li><code>.content() -> Template</code>: Line content including newline character.</li>
|
||||
<li><code>.line_number() -> Integer</code>: 1-based line number.</li>
|
||||
<li><code>.first_line_in_hunk() -> Boolean</code>: False when the directly preceding line
|
||||
references the same commit.</li>
|
||||
</ul>
|
||||
<h3 id="boolean-type">Boolean type<a class="headerlink" href="#boolean-type" title="Permanent link">¶</a></h3>
|
||||
<p>No methods are defined. Can be constructed with <code>false</code> or <code>true</code> literal.</p>
|
||||
<h3 id="commit-type">Commit type<a class="headerlink" href="#commit-type" title="Permanent link">¶</a></h3>
|
||||
@ -2329,9 +2453,16 @@ defined.</p>
|
||||
<li><code>.ends_with(needle: Template) -> Boolean</code></li>
|
||||
<li><code>.remove_prefix(needle: Template) -> String</code>: Removes the passed prefix, if present</li>
|
||||
<li><code>.remove_suffix(needle: Template) -> String</code>: Removes the passed suffix, if present</li>
|
||||
<li><code>.trim() -> String</code>: Removes leading and trailing whitespace</li>
|
||||
<li><code>.trim_start() -> String</code>: Removes leading whitespace</li>
|
||||
<li><code>.trim_end() -> String</code>: Removes trailing whitespace</li>
|
||||
<li><code>.substr(start: Integer, end: Integer) -> String</code>: Extract substring. The
|
||||
<code>start</code>/<code>end</code> indices should be specified in UTF-8 bytes. Negative values
|
||||
count from the end of the string.</li>
|
||||
<li><code>.escape_json() -> String</code>: Serializes the string in JSON format. This
|
||||
function is useful for making machine-readable templates. For example, you
|
||||
can use it in a template like <code>'{ "foo": ' ++ foo.escape_json() ++ ' }'</code> to
|
||||
return a JSON/JSONL.</li>
|
||||
</ul>
|
||||
<h4 id="string-literals">String literals<a class="headerlink" href="#string-literals" title="Permanent link">¶</a></h4>
|
||||
<p>String literals must be surrounded by single or double quotes (<code>'</code> or <code>"</code>).
|
||||
@ -2403,7 +2534,8 @@ inside a single-quoted string literal.</p>
|
||||
<h2 id="configuration">Configuration<a class="headerlink" href="#configuration" title="Permanent link">¶</a></h2>
|
||||
<p>The default templates and aliases() are defined in the <code>[templates]</code> and
|
||||
<code>[template-aliases]</code> sections of the config respectively. The exact definitions
|
||||
can be seen in the <code>cli/src/config/templates.toml</code> file in jj's source tree.</p>
|
||||
can be seen in the <a href="https://github.com/jj-vcs/jj/blob/main/cli/src/config/templates.toml"><code>cli/src/config/templates.toml</code></a> file in jj's source
|
||||
tree.</p>
|
||||
<!--- TODO: Find a way to embed the default config files in the docs -->
|
||||
|
||||
<p>New keywords and functions can be defined as aliases, by using any
|
||||
@ -2473,10 +2605,10 @@ functions will be shadowed by name, and can't co-exist with aliases.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -443,6 +451,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -521,6 +531,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -551,6 +562,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -576,6 +588,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -597,6 +610,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -618,6 +632,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -639,6 +654,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -660,6 +676,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -698,6 +715,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -723,6 +741,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -744,6 +763,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -765,6 +785,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -786,6 +807,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -824,6 +846,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -849,6 +872,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -870,6 +916,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -891,6 +938,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -912,6 +960,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -950,6 +999,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -975,6 +1025,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -996,6 +1047,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1017,6 +1069,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1055,6 +1108,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1080,6 +1134,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1101,6 +1156,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1122,6 +1178,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1143,6 +1200,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1164,6 +1222,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1185,6 +1244,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1223,6 +1305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1248,6 +1331,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1269,6 +1353,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1290,6 +1375,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1311,6 +1397,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1332,6 +1419,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1353,6 +1441,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1381,6 +1470,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1457,6 +1547,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="testimonials">Testimonials<a class="headerlink" href="#testimonials" title="Permanent link">¶</a></h1>
|
||||
<p>You might not be ready to make the jump to Jujutsu yet. It's understandable; new
|
||||
tools come with new lessons, failures, and ideas to absorb. They require
|
||||
@ -1615,10 +1706,10 @@ Jujutsu. I love Jujutsu. I love Jujutsu. I love Jujutsu.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -280,6 +281,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -305,6 +307,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -335,6 +338,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -346,6 +350,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -459,6 +464,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -480,6 +486,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -508,6 +515,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -528,6 +536,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -548,6 +557,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -568,6 +578,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -598,6 +609,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -623,6 +635,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -644,6 +657,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -665,6 +679,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -686,6 +701,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -707,6 +723,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -745,6 +762,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -770,6 +788,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -791,6 +810,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -812,6 +832,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -833,6 +854,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -871,6 +893,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -896,6 +919,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -917,6 +963,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -938,6 +985,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -959,6 +1007,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -997,6 +1046,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1022,6 +1072,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1043,6 +1094,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1064,6 +1116,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1102,6 +1155,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1127,6 +1181,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1148,6 +1203,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1169,6 +1225,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1190,6 +1247,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1211,6 +1269,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1232,6 +1291,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1270,6 +1352,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1295,6 +1378,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1316,6 +1400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1337,6 +1422,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1358,6 +1444,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1379,6 +1466,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1400,6 +1488,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1428,6 +1517,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1549,6 +1639,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="tutorial">Tutorial<a class="headerlink" href="#tutorial" title="Permanent link">¶</a></h1>
|
||||
<blockquote>
|
||||
<p><strong>Hint:</strong> This tutorial has become somewhat out of date. Many people find
|
||||
@ -1580,7 +1671,7 @@ $<span class="w"> </span><span class="nb">cd</span><span class="w"> </span>Hello
|
||||
</code></pre></div>
|
||||
<p>Running <code>jj st</code> (short for <code>jj status</code>) now yields something like this:</p>
|
||||
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>st
|
||||
The<span class="w"> </span>working<span class="w"> </span>copy<span class="w"> </span>is<span class="w"> </span>clean
|
||||
The<span class="w"> </span>working<span class="w"> </span>copy<span class="w"> </span>has<span class="w"> </span>no<span class="w"> </span>changes.
|
||||
Working<span class="w"> </span>copy<span class="w"> </span>:<span class="w"> </span>kntqzsqt<span class="w"> </span>d7439b06<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
|
||||
Parent<span class="w"> </span>commit:<span class="w"> </span>orrkosyo<span class="w"> </span>7fd1a60b<span class="w"> </span>master<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Merge<span class="w"> </span>pull<span class="w"> </span>request<span class="w"> </span><span class="c1">#6 from Spaceghost/patch-1</span>
|
||||
</code></pre></div>
|
||||
@ -1663,7 +1754,7 @@ is for the working-copy changes.</p>
|
||||
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>mpqrykyp<span class="w"> </span>aef4df99<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
|
||||
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>kntqzsqt<span class="w"> </span>5d39e19d<span class="w"> </span>Say<span class="w"> </span>goodbye
|
||||
$<span class="w"> </span>jj<span class="w"> </span>st
|
||||
The<span class="w"> </span>working<span class="w"> </span>copy<span class="w"> </span>is<span class="w"> </span>clean
|
||||
The<span class="w"> </span>working<span class="w"> </span>copy<span class="w"> </span>has<span class="w"> </span>no<span class="w"> </span>changes.
|
||||
Working<span class="w"> </span>copy<span class="w"> </span>:<span class="w"> </span>mpqrykyp<span class="w"> </span>aef4df99<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
|
||||
Parent<span class="w"> </span>commit:<span class="w"> </span>kntqzsqt<span class="w"> </span>5d39e19d<span class="w"> </span>Say<span class="w"> </span>goodbye
|
||||
</code></pre></div>
|
||||
@ -1824,7 +1915,7 @@ There<span class="w"> </span>are<span class="w"> </span>unresolved<span class="w
|
||||
file1<span class="w"> </span><span class="m">2</span>-sided<span class="w"> </span>conflict
|
||||
|
||||
$<span class="w"> </span>jj<span class="w"> </span>st
|
||||
The<span class="w"> </span>working<span class="w"> </span>copy<span class="w"> </span>is<span class="w"> </span>clean
|
||||
The<span class="w"> </span>working<span class="w"> </span>copy<span class="w"> </span>has<span class="w"> </span>no<span class="w"> </span>changes.
|
||||
There<span class="w"> </span>are<span class="w"> </span>unresolved<span class="w"> </span>conflicts<span class="w"> </span>at<span class="w"> </span>these<span class="w"> </span>paths:
|
||||
file1<span class="w"> </span><span class="m">2</span>-sided<span class="w"> </span>conflict
|
||||
Working<span class="w"> </span>copy<span class="w"> </span>:<span class="w"> </span>zxoosnnp<span class="w"> </span>c7068d1c<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
|
||||
@ -2104,10 +2195,10 @@ to specify a path to an executable if it is not in the PATH. <a class="foot
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -280,6 +281,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -305,6 +307,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -326,6 +329,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -347,6 +351,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -377,6 +382,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -388,6 +394,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -481,6 +488,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -501,6 +509,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -521,6 +530,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -541,6 +551,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -571,6 +582,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -596,6 +608,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -617,6 +630,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -638,6 +652,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -659,6 +674,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -680,6 +696,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -718,6 +735,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -743,6 +761,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -764,6 +783,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -785,6 +805,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -806,6 +827,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -844,6 +866,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -869,6 +892,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -890,6 +936,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -911,6 +958,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -932,6 +980,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -970,6 +1019,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -995,6 +1045,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1016,6 +1067,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1037,6 +1089,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1075,6 +1128,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1100,6 +1154,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1121,6 +1176,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1142,6 +1198,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1163,6 +1220,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1184,6 +1242,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1205,6 +1264,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1243,6 +1325,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1268,6 +1351,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1289,6 +1373,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1310,6 +1395,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1331,6 +1417,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1352,6 +1439,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1373,6 +1461,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1401,6 +1490,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1495,6 +1585,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="working-on-windows">Working on Windows<a class="headerlink" href="#working-on-windows" title="Permanent link">¶</a></h1>
|
||||
<p>Jujutsu works the same on all platforms, but there are some caveats that Windows
|
||||
users should be aware of.</p>
|
||||
@ -1606,10 +1697,10 @@ ordinary files.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
<link rel="icon" href="../images/favicon-96x96.png">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
||||
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.6.4">
|
||||
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.8608ea7d.min.css">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
||||
@ -248,6 +248,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Home
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -278,6 +279,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Getting started
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -303,6 +305,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Installation and Setup
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -324,6 +327,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tutorial and Birds-Eye View
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -345,6 +349,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working with GitHub
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -366,6 +371,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working on Windows
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -394,6 +400,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
FAQ
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -414,6 +421,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
CLI Reference
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -434,6 +442,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Testimonials
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -454,6 +463,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Community-built tools
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -486,6 +496,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concepts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -520,6 +531,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -531,6 +543,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Working Copy
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -617,6 +630,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Bookmarks
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -638,6 +652,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -659,6 +674,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Operation Log
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -680,6 +696,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Glossary
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -718,6 +735,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Configuration
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -743,6 +761,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Settings
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -764,6 +783,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Fileset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -785,6 +805,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Revset language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -806,6 +827,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Templating language
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -844,6 +866,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Comparisons
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -869,6 +892,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git comparison
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-command-table/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git command table
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -890,6 +936,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Git compatibility
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -911,6 +958,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sapling
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -932,6 +980,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Other related work
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -970,6 +1019,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Technical details
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -995,6 +1045,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Architecture
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1016,6 +1067,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Concurrency
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1037,6 +1089,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Conflicts
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1075,6 +1128,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Contributing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1100,6 +1154,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Guidelines and "How to...?"
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1121,6 +1176,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Code of conduct
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1142,6 +1198,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1163,6 +1220,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design Doc Blueprint
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1184,6 +1242,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Releasing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1205,6 +1264,29 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Temporary Voting for Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../governance/GOVERNANCE/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Governance
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1243,6 +1325,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Design docs
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1268,6 +1351,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodules
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1289,6 +1373,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
git-submodule-storage
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1310,6 +1395,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
JJ run
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1331,6 +1417,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Sparse Patterns v2
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1352,6 +1439,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Tracking branches
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1373,6 +1461,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Copy tracking and tracing
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1401,6 +1490,7 @@
|
||||
|
||||
<span class="md-ellipsis">
|
||||
Development Roadmap
|
||||
|
||||
</span>
|
||||
|
||||
|
||||
@ -1495,6 +1585,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<h1 id="working-copy">Working copy<a class="headerlink" href="#working-copy" title="Permanent link">¶</a></h1>
|
||||
<h2 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">¶</a></h2>
|
||||
<p>The working copy is where the current working-copy commit's files are written so
|
||||
@ -1635,10 +1726,10 @@ working-copy commit.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.f8cc74c7.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.f1b6f286.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
1473
v0.27.0/404.html
Normal file
1473
v0.27.0/404.html
Normal file
File diff suppressed because it is too large
Load Diff
2401
v0.27.0/FAQ/index.html
Normal file
2401
v0.27.0/FAQ/index.html
Normal file
File diff suppressed because it is too large
Load Diff
BIN
v0.27.0/assets/images/favicon.png
Normal file
BIN
v0.27.0/assets/images/favicon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
16
v0.27.0/assets/javascripts/bundle.f1b6f286.min.js
vendored
Normal file
16
v0.27.0/assets/javascripts/bundle.f1b6f286.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
7
v0.27.0/assets/javascripts/bundle.f1b6f286.min.js.map
Normal file
7
v0.27.0/assets/javascripts/bundle.f1b6f286.min.js.map
Normal file
File diff suppressed because one or more lines are too long
1
v0.27.0/assets/javascripts/lunr/min/lunr.ar.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.ar.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.27.0/assets/javascripts/lunr/min/lunr.da.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.da.min.js
vendored
Normal file
@ -0,0 +1,18 @@
|
||||
/*!
|
||||
* Lunr languages, `Danish` language
|
||||
* https://github.com/MihaiValentin/lunr-languages
|
||||
*
|
||||
* Copyright 2014, Mihai Valentin
|
||||
* http://www.mozilla.org/MPL/
|
||||
*/
|
||||
/*!
|
||||
* based on
|
||||
* Snowball JavaScript Library v0.3
|
||||
* http://code.google.com/p/urim/
|
||||
* http://snowball.tartarus.org/
|
||||
*
|
||||
* Copyright 2010, Oleg Mazko
|
||||
* http://www.mozilla.org/MPL/
|
||||
*/
|
||||
|
||||
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.da=function(){this.pipeline.reset(),this.pipeline.add(e.da.trimmer,e.da.stopWordFilter,e.da.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.da.stemmer))},e.da.wordCharacters="A-Za-zªºÀ-ÖØ-öø-ʸˠ-ˤᴀ-ᴥᴬ-ᵜᵢ-ᵥᵫ-ᵷᵹ-ᶾḀ-ỿⁱⁿₐ-ₜKÅℲⅎⅠ-ↈⱠ-ⱿꜢ-ꞇꞋ-ꞭꞰ-ꞷꟷ-ꟿꬰ-ꭚꭜ-ꭤff-stＡ-Ｚａ-ｚ",e.da.trimmer=e.trimmerSupport.generateTrimmer(e.da.wordCharacters),e.Pipeline.registerFunction(e.da.trimmer,"trimmer-da"),e.da.stemmer=function(){var r=e.stemmerSupport.Among,i=e.stemmerSupport.SnowballProgram,n=new function(){function e(){var e,r=f.cursor+3;if(d=f.limit,0<=r&&r<=f.limit){for(a=r;;){if(e=f.cursor,f.in_grouping(w,97,248)){f.cursor=e;break}if(f.cursor=e,e>=f.limit)return;f.cursor++}for(;!f.out_grouping(w,97,248);){if(f.cursor>=f.limit)return;f.cursor++}d=f.cursor,d<a&&(d=a)}}function n(){var e,r;if(f.cursor>=d&&(r=f.limit_backward,f.limit_backward=d,f.ket=f.cursor,e=f.find_among_b(c,32),f.limit_backward=r,e))switch(f.bra=f.cursor,e){case 1:f.slice_del();break;case 2:f.in_grouping_b(p,97,229)&&f.slice_del()}}function t(){var e,r=f.limit-f.cursor;f.cursor>=d&&(e=f.limit_backward,f.limit_backward=d,f.ket=f.cursor,f.find_among_b(l,4)?(f.bra=f.cursor,f.limit_backward=e,f.cursor=f.limit-r,f.cursor>f.limit_backward&&(f.cursor--,f.bra=f.cursor,f.slice_del())):f.limit_backward=e)}function s(){var e,r,i,n=f.limit-f.cursor;if(f.ket=f.cursor,f.eq_s_b(2,"st")&&(f.bra=f.cursor,f.eq_s_b(2,"ig")&&f.slice_del()),f.cursor=f.limit-n,f.cursor>=d&&(r=f.limit_backward,f.limit_backward=d,f.ket=f.cursor,e=f.find_among_b(m,5),f.limit_backward=r,e))switch(f.bra=f.cursor,e){case 1:f.slice_del(),i=f.limit-f.cursor,t(),f.cursor=f.limit-i;break;case 2:f.slice_from("løs")}}function o(){var e;f.cursor>=d&&(e=f.limit_backward,f.limit_backward=d,f.ket=f.cursor,f.out_grouping_b(w,97,248)?(f.bra=f.cursor,u=f.slice_to(u),f.limit_backward=e,f.eq_v_b(u)&&f.slice_del()):f.limit_backward=e)}var a,d,u,c=[new r("hed",-1,1),new r("ethed",0,1),new r("ered",-1,1),new r("e",-1,1),new r("erede",3,1),new r("ende",3,1),new r("erende",5,1),new r("ene",3,1),new r("erne",3,1),new r("ere",3,1),new r("en",-1,1),new r("heden",10,1),new r("eren",10,1),new r("er",-1,1),new r("heder",13,1),new r("erer",13,1),new r("s",-1,2),new r("heds",16,1),new r("es",16,1),new r("endes",18,1),new r("erendes",19,1),new r("enes",18,1),new r("ernes",18,1),new r("eres",18,1),new r("ens",16,1),new r("hedens",24,1),new r("erens",24,1),new r("ers",16,1),new r("ets",16,1),new r("erets",28,1),new r("et",-1,1),new r("eret",30,1)],l=[new r("gd",-1,-1),new r("dt",-1,-1),new r("gt",-1,-1),new r("kt",-1,-1)],m=[new r("ig",-1,1),new r("lig",0,1),new r("elig",1,1),new r("els",-1,1),new r("løst",-1,2)],w=[17,65,16,1,0,0,0,0,0,0,0,0,0,0,0,0,48,0,128],p=[239,254,42,3,0,0,0,0,0,0,0,0,0,0,0,0,16],f=new i;this.setCurrent=function(e){f.setCurrent(e)},this.getCurrent=function(){return f.getCurrent()},this.stem=function(){var r=f.cursor;return e(),f.limit_backward=r,f.cursor=f.limit,n(),f.cursor=f.limit,t(),f.cursor=f.limit,s(),f.cursor=f.limit,o(),!0}};return function(e){return"function"==typeof e.update?e.update(function(e){return n.setCurrent(e),n.stem(),n.getCurrent()}):(n.setCurrent(e),n.stem(),n.getCurrent())}}(),e.Pipeline.registerFunction(e.da.stemmer,"stemmer-da"),e.da.stopWordFilter=e.generateStopWordFilter("ad af alle alt anden at blev blive bliver da de dem den denne der deres det dette dig din disse dog du efter eller en end er et for fra ham han hans har havde have hende hendes her hos hun hvad hvis hvor i ikke ind jeg jer jo kunne man mange med meget men mig min mine mit mod ned noget nogle nu når og også om op os over på selv sig sin sine sit skal skulle som sådan thi til ud under var vi vil ville vor være været".split(" ")),e.Pipeline.registerFunction(e.da.stopWordFilter,"stopWordFilter-da")}});
|
||||
18
v0.27.0/assets/javascripts/lunr/min/lunr.de.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.de.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.27.0/assets/javascripts/lunr/min/lunr.du.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.du.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.27.0/assets/javascripts/lunr/min/lunr.el.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.el.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.27.0/assets/javascripts/lunr/min/lunr.es.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.es.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.27.0/assets/javascripts/lunr/min/lunr.fi.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.fi.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.27.0/assets/javascripts/lunr/min/lunr.fr.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.fr.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.27.0/assets/javascripts/lunr/min/lunr.he.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.he.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.27.0/assets/javascripts/lunr/min/lunr.hi.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.hi.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.hi=function(){this.pipeline.reset(),this.pipeline.add(e.hi.trimmer,e.hi.stopWordFilter,e.hi.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.hi.stemmer))},e.hi.wordCharacters="ऀ-ःऄ-एऐ-टठ-यर-िी-ॏॐ-य़ॠ-९॰-ॿa-zA-Zａ-ｚＡ-Ｚ0-9０-９",e.hi.trimmer=e.trimmerSupport.generateTrimmer(e.hi.wordCharacters),e.Pipeline.registerFunction(e.hi.trimmer,"trimmer-hi"),e.hi.stopWordFilter=e.generateStopWordFilter("अत अपना अपनी अपने अभी अंदर आदि आप इत्यादि इन इनका इन्हीं इन्हें इन्हों इस इसका इसकी इसके इसमें इसी इसे उन उनका उनकी उनके उनको उन्हीं उन्हें उन्हों उस उसके उसी उसे एक एवं एस ऐसे और कई कर करता करते करना करने करें कहते कहा का काफ़ी कि कितना किन्हें किन्हों किया किर किस किसी किसे की कुछ कुल के को कोई कौन कौनसा गया घर जब जहाँ जा जितना जिन जिन्हें जिन्हों जिस जिसे जीधर जैसा जैसे जो तक तब तरह तिन तिन्हें तिन्हों तिस तिसे तो था थी थे दबारा दिया दुसरा दूसरे दो द्वारा न नके नहीं ना निहायत नीचे ने पर पहले पूरा पे फिर बनी बही बहुत बाद बाला बिलकुल भी भीतर मगर मानो मे में यदि यह यहाँ यही या यिह ये रखें रहा रहे ऱ्वासा लिए लिये लेकिन व वग़ैरह वर्ग वह वहाँ वहीं वाले वुह वे वो सकता सकते सबसे सभी साथ साबुत साभ सारा से सो संग ही हुआ हुई हुए है हैं हो होता होती होते होना होने".split(" ")),e.hi.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var r=e.wordcut;r.init(),e.hi.tokenizer=function(i){if(!arguments.length||null==i||void 0==i)return[];if(Array.isArray(i))return i.map(function(r){return isLunr2?new e.Token(r.toLowerCase()):r.toLowerCase()});var t=i.toString().toLowerCase().replace(/^\s+/,"");return r.cut(t).split("|")},e.Pipeline.registerFunction(e.hi.stemmer,"stemmer-hi"),e.Pipeline.registerFunction(e.hi.stopWordFilter,"stopWordFilter-hi")}});
|
||||
18
v0.27.0/assets/javascripts/lunr/min/lunr.hu.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.hu.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.27.0/assets/javascripts/lunr/min/lunr.hy.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.hy.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.hy=function(){this.pipeline.reset(),this.pipeline.add(e.hy.trimmer,e.hy.stopWordFilter)},e.hy.wordCharacters="[A-Za-z-֏ff-ﭏ]",e.hy.trimmer=e.trimmerSupport.generateTrimmer(e.hy.wordCharacters),e.Pipeline.registerFunction(e.hy.trimmer,"trimmer-hy"),e.hy.stopWordFilter=e.generateStopWordFilter("դու և եք էիր էիք հետո նաև նրանք որը վրա է որ պիտի են այս մեջ ն իր ու ի այդ որոնք այն կամ էր մի ես համար այլ իսկ էին ենք հետ ին թ էինք մենք նրա նա դուք եմ էի ըստ որպես ում".split(" ")),e.Pipeline.registerFunction(e.hy.stopWordFilter,"stopWordFilter-hy"),e.hy.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}(),e.Pipeline.registerFunction(e.hy.stemmer,"stemmer-hy")}});
|
||||
18
v0.27.0/assets/javascripts/lunr/min/lunr.it.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.it.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.27.0/assets/javascripts/lunr/min/lunr.ja.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.ja.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");var r="2"==e.version[0];e.ja=function(){this.pipeline.reset(),this.pipeline.add(e.ja.trimmer,e.ja.stopWordFilter,e.ja.stemmer),r?this.tokenizer=e.ja.tokenizer:(e.tokenizer&&(e.tokenizer=e.ja.tokenizer),this.tokenizerFn&&(this.tokenizerFn=e.ja.tokenizer))};var t=new e.TinySegmenter;e.ja.tokenizer=function(i){var n,o,s,p,a,u,m,l,c,f;if(!arguments.length||null==i||void 0==i)return[];if(Array.isArray(i))return i.map(function(t){return r?new e.Token(t.toLowerCase()):t.toLowerCase()});for(o=i.toString().toLowerCase().replace(/^\s+/,""),n=o.length-1;n>=0;n--)if(/\S/.test(o.charAt(n))){o=o.substring(0,n+1);break}for(a=[],s=o.length,c=0,l=0;c<=s;c++)if(u=o.charAt(c),m=c-l,u.match(/\s/)||c==s){if(m>0)for(p=t.segment(o.slice(l,c)).filter(function(e){return!!e}),f=l,n=0;n<p.length;n++)r?a.push(new e.Token(p[n],{position:[f,p[n].length],index:a.length})):a.push(p[n]),f+=p[n].length;l=c+1}return a},e.ja.stemmer=function(){return function(e){return e}}(),e.Pipeline.registerFunction(e.ja.stemmer,"stemmer-ja"),e.ja.wordCharacters="一二三四五六七八九十百千万億兆一-龠々〆ヵヶぁ-んァ-ヴーｱ-ﾝﾞa-zA-Zａ-ｚＡ-Ｚ0-9０-９",e.ja.trimmer=e.trimmerSupport.generateTrimmer(e.ja.wordCharacters),e.Pipeline.registerFunction(e.ja.trimmer,"trimmer-ja"),e.ja.stopWordFilter=e.generateStopWordFilter("これ それ あれ この その あの ここ そこ あそこ こちら どこ だれ なに なん 何 私 貴方 貴方方 我々 私達 あの人 あのかた 彼女 彼 です あります おります います は が の に を で え から まで より も どの と し それで しかし".split(" ")),e.Pipeline.registerFunction(e.ja.stopWordFilter,"stopWordFilter-ja"),e.jp=e.ja,e.Pipeline.registerFunction(e.jp.stemmer,"stemmer-jp"),e.Pipeline.registerFunction(e.jp.trimmer,"trimmer-jp"),e.Pipeline.registerFunction(e.jp.stopWordFilter,"stopWordFilter-jp")}});
|
||||
1
v0.27.0/assets/javascripts/lunr/min/lunr.jp.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.jp.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
module.exports=require("./lunr.ja");
|
||||
1
v0.27.0/assets/javascripts/lunr/min/lunr.kn.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.kn.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.kn=function(){this.pipeline.reset(),this.pipeline.add(e.kn.trimmer,e.kn.stopWordFilter,e.kn.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.kn.stemmer))},e.kn.wordCharacters="ಀ-಄ಅ-ಔಕ-ಹಾ-ೌ಼-ಽೕ-ೖೝ-ೞೠ-ೡೢ-ೣ೦-೯ೱ-ೳ",e.kn.trimmer=e.trimmerSupport.generateTrimmer(e.kn.wordCharacters),e.Pipeline.registerFunction(e.kn.trimmer,"trimmer-kn"),e.kn.stopWordFilter=e.generateStopWordFilter("ಮತ್ತು ಈ ಒಂದು ರಲ್ಲಿ ಹಾಗೂ ಎಂದು ಅಥವಾ ಇದು ರ ಅವರು ಎಂಬ ಮೇಲೆ ಅವರ ತನ್ನ ಆದರೆ ತಮ್ಮ ನಂತರ ಮೂಲಕ ಹೆಚ್ಚು ನ ಆ ಕೆಲವು ಅನೇಕ ಎರಡು ಹಾಗು ಪ್ರಮುಖ ಇದನ್ನು ಇದರ ಸುಮಾರು ಅದರ ಅದು ಮೊದಲ ಬಗ್ಗೆ ನಲ್ಲಿ ರಂದು ಇತರ ಅತ್ಯಂತ ಹೆಚ್ಚಿನ ಸಹ ಸಾಮಾನ್ಯವಾಗಿ ನೇ ಹಲವಾರು ಹೊಸ ದಿ ಕಡಿಮೆ ಯಾವುದೇ ಹೊಂದಿದೆ ದೊಡ್ಡ ಅನ್ನು ಇವರು ಪ್ರಕಾರ ಇದೆ ಮಾತ್ರ ಕೂಡ ಇಲ್ಲಿ ಎಲ್ಲಾ ವಿವಿಧ ಅದನ್ನು ಹಲವು ರಿಂದ ಕೇವಲ ದ ದಕ್ಷಿಣ ಗೆ ಅವನ ಅತಿ ನೆಯ ಬಹಳ ಕೆಲಸ ಎಲ್ಲ ಪ್ರತಿ ಇತ್ಯಾದಿ ಇವು ಬೇರೆ ಹೀಗೆ ನಡುವೆ ಇದಕ್ಕೆ ಎಸ್ ಇವರ ಮೊದಲು ಶ್ರೀ ಮಾಡುವ ಇದರಲ್ಲಿ ರೀತಿಯ ಮಾಡಿದ ಕಾಲ ಅಲ್ಲಿ ಮಾಡಲು ಅದೇ ಈಗ ಅವು ಗಳು ಎ ಎಂಬುದು ಅವನು ಅಂದರೆ ಅವರಿಗೆ ಇರುವ ವಿಶೇಷ ಮುಂದೆ ಅವುಗಳ ಮುಂತಾದ ಮೂಲ ಬಿ ಮೀ ಒಂದೇ ಇನ್ನೂ ಹೆಚ್ಚಾಗಿ ಮಾಡಿ ಅವರನ್ನು ಇದೇ ಯ ರೀತಿಯಲ್ಲಿ ಜೊತೆ ಅದರಲ್ಲಿ ಮಾಡಿದರು ನಡೆದ ಆಗ ಮತ್ತೆ ಪೂರ್ವ ಆತ ಬಂದ ಯಾವ ಒಟ್ಟು ಇತರೆ ಹಿಂದೆ ಪ್ರಮಾಣದ ಗಳನ್ನು ಕುರಿತು ಯು ಆದ್ದರಿಂದ ಅಲ್ಲದೆ ನಗರದ ಮೇಲಿನ ಏಕೆಂದರೆ ರಷ್ಟು ಎಂಬುದನ್ನು ಬಾರಿ ಎಂದರೆ ಹಿಂದಿನ ಆದರೂ ಆದ ಸಂಬಂಧಿಸಿದ ಮತ್ತೊಂದು ಸಿ ಆತನ ".split(" ")),e.kn.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var r=e.wordcut;r.init(),e.kn.tokenizer=function(t){if(!arguments.length||null==t||void 0==t)return[];if(Array.isArray(t))return t.map(function(r){return isLunr2?new e.Token(r.toLowerCase()):r.toLowerCase()});var n=t.toString().toLowerCase().replace(/^\s+/,"");return r.cut(n).split("|")},e.Pipeline.registerFunction(e.kn.stemmer,"stemmer-kn"),e.Pipeline.registerFunction(e.kn.stopWordFilter,"stopWordFilter-kn")}});
|
||||
1
v0.27.0/assets/javascripts/lunr/min/lunr.ko.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.ko.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.27.0/assets/javascripts/lunr/min/lunr.multi.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.multi.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
!function(e,t){"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():t()(e.lunr)}(this,function(){return function(e){e.multiLanguage=function(){for(var t=Array.prototype.slice.call(arguments),i=t.join("-"),r="",n=[],s=[],p=0;p<t.length;++p)"en"==t[p]?(r+="\\w",n.unshift(e.stopWordFilter),n.push(e.stemmer),s.push(e.stemmer)):(r+=e[t[p]].wordCharacters,e[t[p]].stopWordFilter&&n.unshift(e[t[p]].stopWordFilter),e[t[p]].stemmer&&(n.push(e[t[p]].stemmer),s.push(e[t[p]].stemmer)));var o=e.trimmerSupport.generateTrimmer(r);return e.Pipeline.registerFunction(o,"lunr-multi-trimmer-"+i),n.unshift(o),function(){this.pipeline.reset(),this.pipeline.add.apply(this.pipeline,n),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add.apply(this.searchPipeline,s))}}}});
|
||||
18
v0.27.0/assets/javascripts/lunr/min/lunr.nl.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.nl.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.27.0/assets/javascripts/lunr/min/lunr.no.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.no.min.js
vendored
Normal file
@ -0,0 +1,18 @@
|
||||
/*!
|
||||
* Lunr languages, `Norwegian` language
|
||||
* https://github.com/MihaiValentin/lunr-languages
|
||||
*
|
||||
* Copyright 2014, Mihai Valentin
|
||||
* http://www.mozilla.org/MPL/
|
||||
*/
|
||||
/*!
|
||||
* based on
|
||||
* Snowball JavaScript Library v0.3
|
||||
* http://code.google.com/p/urim/
|
||||
* http://snowball.tartarus.org/
|
||||
*
|
||||
* Copyright 2010, Oleg Mazko
|
||||
* http://www.mozilla.org/MPL/
|
||||
*/
|
||||
|
||||
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.no=function(){this.pipeline.reset(),this.pipeline.add(e.no.trimmer,e.no.stopWordFilter,e.no.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.no.stemmer))},e.no.wordCharacters="A-Za-zªºÀ-ÖØ-öø-ʸˠ-ˤᴀ-ᴥᴬ-ᵜᵢ-ᵥᵫ-ᵷᵹ-ᶾḀ-ỿⁱⁿₐ-ₜKÅℲⅎⅠ-ↈⱠ-ⱿꜢ-ꞇꞋ-ꞭꞰ-ꞷꟷ-ꟿꬰ-ꭚꭜ-ꭤff-stＡ-Ｚａ-ｚ",e.no.trimmer=e.trimmerSupport.generateTrimmer(e.no.wordCharacters),e.Pipeline.registerFunction(e.no.trimmer,"trimmer-no"),e.no.stemmer=function(){var r=e.stemmerSupport.Among,n=e.stemmerSupport.SnowballProgram,i=new function(){function e(){var e,r=w.cursor+3;if(a=w.limit,0<=r||r<=w.limit){for(s=r;;){if(e=w.cursor,w.in_grouping(d,97,248)){w.cursor=e;break}if(e>=w.limit)return;w.cursor=e+1}for(;!w.out_grouping(d,97,248);){if(w.cursor>=w.limit)return;w.cursor++}a=w.cursor,a<s&&(a=s)}}function i(){var e,r,n;if(w.cursor>=a&&(r=w.limit_backward,w.limit_backward=a,w.ket=w.cursor,e=w.find_among_b(m,29),w.limit_backward=r,e))switch(w.bra=w.cursor,e){case 1:w.slice_del();break;case 2:n=w.limit-w.cursor,w.in_grouping_b(c,98,122)?w.slice_del():(w.cursor=w.limit-n,w.eq_s_b(1,"k")&&w.out_grouping_b(d,97,248)&&w.slice_del());break;case 3:w.slice_from("er")}}function t(){var e,r=w.limit-w.cursor;w.cursor>=a&&(e=w.limit_backward,w.limit_backward=a,w.ket=w.cursor,w.find_among_b(u,2)?(w.bra=w.cursor,w.limit_backward=e,w.cursor=w.limit-r,w.cursor>w.limit_backward&&(w.cursor--,w.bra=w.cursor,w.slice_del())):w.limit_backward=e)}function o(){var e,r;w.cursor>=a&&(r=w.limit_backward,w.limit_backward=a,w.ket=w.cursor,e=w.find_among_b(l,11),e?(w.bra=w.cursor,w.limit_backward=r,1==e&&w.slice_del()):w.limit_backward=r)}var s,a,m=[new r("a",-1,1),new r("e",-1,1),new r("ede",1,1),new r("ande",1,1),new r("ende",1,1),new r("ane",1,1),new r("ene",1,1),new r("hetene",6,1),new r("erte",1,3),new r("en",-1,1),new r("heten",9,1),new r("ar",-1,1),new r("er",-1,1),new r("heter",12,1),new r("s",-1,2),new r("as",14,1),new r("es",14,1),new r("edes",16,1),new r("endes",16,1),new r("enes",16,1),new r("hetenes",19,1),new r("ens",14,1),new r("hetens",21,1),new r("ers",14,1),new r("ets",14,1),new r("et",-1,1),new r("het",25,1),new r("ert",-1,3),new r("ast",-1,1)],u=[new r("dt",-1,-1),new r("vt",-1,-1)],l=[new r("leg",-1,1),new r("eleg",0,1),new r("ig",-1,1),new r("eig",2,1),new r("lig",2,1),new r("elig",4,1),new r("els",-1,1),new r("lov",-1,1),new r("elov",7,1),new r("slov",7,1),new r("hetslov",9,1)],d=[17,65,16,1,0,0,0,0,0,0,0,0,0,0,0,0,48,0,128],c=[119,125,149,1],w=new n;this.setCurrent=function(e){w.setCurrent(e)},this.getCurrent=function(){return w.getCurrent()},this.stem=function(){var r=w.cursor;return e(),w.limit_backward=r,w.cursor=w.limit,i(),w.cursor=w.limit,t(),w.cursor=w.limit,o(),!0}};return function(e){return"function"==typeof e.update?e.update(function(e){return i.setCurrent(e),i.stem(),i.getCurrent()}):(i.setCurrent(e),i.stem(),i.getCurrent())}}(),e.Pipeline.registerFunction(e.no.stemmer,"stemmer-no"),e.no.stopWordFilter=e.generateStopWordFilter("alle at av bare begge ble blei bli blir blitt både båe da de deg dei deim deira deires dem den denne der dere deres det dette di din disse ditt du dykk dykkar då eg ein eit eitt eller elles en enn er et ett etter for fordi fra før ha hadde han hans har hennar henne hennes her hjå ho hoe honom hoss hossen hun hva hvem hver hvilke hvilken hvis hvor hvordan hvorfor i ikke ikkje ikkje ingen ingi inkje inn inni ja jeg kan kom korleis korso kun kunne kva kvar kvarhelst kven kvi kvifor man mange me med medan meg meget mellom men mi min mine mitt mot mykje ned no noe noen noka noko nokon nokor nokre nå når og også om opp oss over på samme seg selv si si sia sidan siden sin sine sitt sjøl skal skulle slik so som som somme somt så sånn til um upp ut uten var vart varte ved vere verte vi vil ville vore vors vort vår være være vært å".split(" ")),e.Pipeline.registerFunction(e.no.stopWordFilter,"stopWordFilter-no")}});
|
||||
18
v0.27.0/assets/javascripts/lunr/min/lunr.pt.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.pt.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.27.0/assets/javascripts/lunr/min/lunr.ro.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.ro.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.27.0/assets/javascripts/lunr/min/lunr.ru.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.ru.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.27.0/assets/javascripts/lunr/min/lunr.sa.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.sa.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.sa=function(){this.pipeline.reset(),this.pipeline.add(e.sa.trimmer,e.sa.stopWordFilter,e.sa.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.sa.stemmer))},e.sa.wordCharacters="ऀ-ःऄ-एऐ-टठ-यर-िी-ॏॐ-य़ॠ-९॰-ॿ꣠-꣱ꣲ-ꣷ꣸-ꣻ꣼-ꣽꣾ-ꣿᆰ0-ᆰ9",e.sa.trimmer=e.trimmerSupport.generateTrimmer(e.sa.wordCharacters),e.Pipeline.registerFunction(e.sa.trimmer,"trimmer-sa"),e.sa.stopWordFilter=e.generateStopWordFilter('तथा अयम् एकम् इत्यस्मिन् तथा तत् वा अयम् इत्यस्य ते आहूत उपरि तेषाम् किन्तु तेषाम् तदा इत्यनेन अधिकः इत्यस्य तत् केचन बहवः द्वि तथा महत्वपूर्णः अयम् अस्य विषये अयं अस्ति तत् प्रथमः विषये इत्युपरि इत्युपरि इतर अधिकतमः अधिकः अपि सामान्यतया ठ इतरेतर नूतनम् द न्यूनम् कश्चित् वा विशालः द सः अस्ति तदनुसारम् तत्र अस्ति केवलम् अपि अत्र सर्वे विविधाः तत् बहवः यतः इदानीम् द दक्षिण इत्यस्मै तस्य उपरि नथ अतीव कार्यम् सर्वे एकैकम् इत्यादि। एते सन्ति उत इत्थम् मध्ये एतदर्थं . स कस्य प्रथमः श्री. करोति अस्मिन् प्रकारः निर्मिता कालः तत्र कर्तुं समान अधुना ते सन्ति स एकः अस्ति सः अर्थात् तेषां कृते . स्थितम् विशेषः अग्रिम तेषाम् समान स्रोतः ख म समान इदानीमपि अधिकतया करोतु ते समान इत्यस्य वीथी सह यस्मिन् कृतवान् धृतः तदा पुनः पूर्वं सः आगतः किम् कुल इतर पुरा मात्रा स विषये उ अतएव अपि नगरस्य उपरि यतः प्रतिशतं कतरः कालः साधनानि भूत तथापि जात सम्बन्धि अन्यत् ग अतः अस्माकं स्वकीयाः अस्माकं इदानीं अन्तः इत्यादयः भवन्तः इत्यादयः एते एताः तस्य अस्य इदम् एते तेषां तेषां तेषां तान् तेषां तेषां तेषां समानः सः एकः च तादृशाः बहवः अन्ये च वदन्ति यत् कियत् कस्मै कस्मै यस्मै यस्मै यस्मै यस्मै न अतिनीचः किन्तु प्रथमं सम्पूर्णतया ततः चिरकालानन्तरं पुस्तकं सम्पूर्णतया अन्तः किन्तु अत्र वा इह इव श्रद्धाय अवशिष्यते परन्तु अन्ये वर्गाः सन्ति ते सन्ति शक्नुवन्ति सर्वे मिलित्वा सर्वे एकत्र"'.split(" ")),e.sa.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var r=e.wordcut;r.init(),e.sa.tokenizer=function(t){if(!arguments.length||null==t||void 0==t)return[];if(Array.isArray(t))return t.map(function(r){return isLunr2?new e.Token(r.toLowerCase()):r.toLowerCase()});var i=t.toString().toLowerCase().replace(/^\s+/,"");return r.cut(i).split("|")},e.Pipeline.registerFunction(e.sa.stemmer,"stemmer-sa"),e.Pipeline.registerFunction(e.sa.stopWordFilter,"stopWordFilter-sa")}});
|
||||
1
v0.27.0/assets/javascripts/lunr/min/lunr.stemmer.support.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.stemmer.support.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
!function(r,t){"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():t()(r.lunr)}(this,function(){return function(r){r.stemmerSupport={Among:function(r,t,i,s){if(this.toCharArray=function(r){for(var t=r.length,i=new Array(t),s=0;s<t;s++)i[s]=r.charCodeAt(s);return i},!r&&""!=r||!t&&0!=t||!i)throw"Bad Among initialisation: s:"+r+", substring_i: "+t+", result: "+i;this.s_size=r.length,this.s=this.toCharArray(r),this.substring_i=t,this.result=i,this.method=s},SnowballProgram:function(){var r;return{bra:0,ket:0,limit:0,cursor:0,limit_backward:0,setCurrent:function(t){r=t,this.cursor=0,this.limit=t.length,this.limit_backward=0,this.bra=this.cursor,this.ket=this.limit},getCurrent:function(){var t=r;return r=null,t},in_grouping:function(t,i,s){if(this.cursor<this.limit){var e=r.charCodeAt(this.cursor);if(e<=s&&e>=i&&(e-=i,t[e>>3]&1<<(7&e)))return this.cursor++,!0}return!1},in_grouping_b:function(t,i,s){if(this.cursor>this.limit_backward){var e=r.charCodeAt(this.cursor-1);if(e<=s&&e>=i&&(e-=i,t[e>>3]&1<<(7&e)))return this.cursor--,!0}return!1},out_grouping:function(t,i,s){if(this.cursor<this.limit){var e=r.charCodeAt(this.cursor);if(e>s||e<i)return this.cursor++,!0;if(e-=i,!(t[e>>3]&1<<(7&e)))return this.cursor++,!0}return!1},out_grouping_b:function(t,i,s){if(this.cursor>this.limit_backward){var e=r.charCodeAt(this.cursor-1);if(e>s||e<i)return this.cursor--,!0;if(e-=i,!(t[e>>3]&1<<(7&e)))return this.cursor--,!0}return!1},eq_s:function(t,i){if(this.limit-this.cursor<t)return!1;for(var s=0;s<t;s++)if(r.charCodeAt(this.cursor+s)!=i.charCodeAt(s))return!1;return this.cursor+=t,!0},eq_s_b:function(t,i){if(this.cursor-this.limit_backward<t)return!1;for(var s=0;s<t;s++)if(r.charCodeAt(this.cursor-t+s)!=i.charCodeAt(s))return!1;return this.cursor-=t,!0},find_among:function(t,i){for(var s=0,e=i,n=this.cursor,u=this.limit,o=0,h=0,c=!1;;){for(var a=s+(e-s>>1),f=0,l=o<h?o:h,_=t[a],m=l;m<_.s_size;m++){if(n+l==u){f=-1;break}if(f=r.charCodeAt(n+l)-_.s[m])break;l++}if(f<0?(e=a,h=l):(s=a,o=l),e-s<=1){if(s>0||e==s||c)break;c=!0}}for(;;){var _=t[s];if(o>=_.s_size){if(this.cursor=n+_.s_size,!_.method)return _.result;var b=_.method();if(this.cursor=n+_.s_size,b)return _.result}if((s=_.substring_i)<0)return 0}},find_among_b:function(t,i){for(var s=0,e=i,n=this.cursor,u=this.limit_backward,o=0,h=0,c=!1;;){for(var a=s+(e-s>>1),f=0,l=o<h?o:h,_=t[a],m=_.s_size-1-l;m>=0;m--){if(n-l==u){f=-1;break}if(f=r.charCodeAt(n-1-l)-_.s[m])break;l++}if(f<0?(e=a,h=l):(s=a,o=l),e-s<=1){if(s>0||e==s||c)break;c=!0}}for(;;){var _=t[s];if(o>=_.s_size){if(this.cursor=n-_.s_size,!_.method)return _.result;var b=_.method();if(this.cursor=n-_.s_size,b)return _.result}if((s=_.substring_i)<0)return 0}},replace_s:function(t,i,s){var e=s.length-(i-t),n=r.substring(0,t),u=r.substring(i);return r=n+s+u,this.limit+=e,this.cursor>=i?this.cursor+=e:this.cursor>t&&(this.cursor=t),e},slice_check:function(){if(this.bra<0||this.bra>this.ket||this.ket>this.limit||this.limit>r.length)throw"faulty slice operation"},slice_from:function(r){this.slice_check(),this.replace_s(this.bra,this.ket,r)},slice_del:function(){this.slice_from("")},insert:function(r,t,i){var s=this.replace_s(r,t,i);r<=this.bra&&(this.bra+=s),r<=this.ket&&(this.ket+=s)},slice_to:function(){return this.slice_check(),r.substring(this.bra,this.ket)},eq_v_b:function(r){return this.eq_s_b(r.length,r)}}}},r.trimmerSupport={generateTrimmer:function(r){var t=new RegExp("^[^"+r+"]+"),i=new RegExp("[^"+r+"]+$");return function(r){return"function"==typeof r.update?r.update(function(r){return r.replace(t,"").replace(i,"")}):r.replace(t,"").replace(i,"")}}}}});
|
||||
18
v0.27.0/assets/javascripts/lunr/min/lunr.sv.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.sv.min.js
vendored
Normal file
@ -0,0 +1,18 @@
|
||||
/*!
|
||||
* Lunr languages, `Swedish` language
|
||||
* https://github.com/MihaiValentin/lunr-languages
|
||||
*
|
||||
* Copyright 2014, Mihai Valentin
|
||||
* http://www.mozilla.org/MPL/
|
||||
*/
|
||||
/*!
|
||||
* based on
|
||||
* Snowball JavaScript Library v0.3
|
||||
* http://code.google.com/p/urim/
|
||||
* http://snowball.tartarus.org/
|
||||
*
|
||||
* Copyright 2010, Oleg Mazko
|
||||
* http://www.mozilla.org/MPL/
|
||||
*/
|
||||
|
||||
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.sv=function(){this.pipeline.reset(),this.pipeline.add(e.sv.trimmer,e.sv.stopWordFilter,e.sv.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.sv.stemmer))},e.sv.wordCharacters="A-Za-zªºÀ-ÖØ-öø-ʸˠ-ˤᴀ-ᴥᴬ-ᵜᵢ-ᵥᵫ-ᵷᵹ-ᶾḀ-ỿⁱⁿₐ-ₜKÅℲⅎⅠ-ↈⱠ-ⱿꜢ-ꞇꞋ-ꞭꞰ-ꞷꟷ-ꟿꬰ-ꭚꭜ-ꭤff-stＡ-Ｚａ-ｚ",e.sv.trimmer=e.trimmerSupport.generateTrimmer(e.sv.wordCharacters),e.Pipeline.registerFunction(e.sv.trimmer,"trimmer-sv"),e.sv.stemmer=function(){var r=e.stemmerSupport.Among,n=e.stemmerSupport.SnowballProgram,t=new function(){function e(){var e,r=w.cursor+3;if(o=w.limit,0<=r||r<=w.limit){for(a=r;;){if(e=w.cursor,w.in_grouping(l,97,246)){w.cursor=e;break}if(w.cursor=e,w.cursor>=w.limit)return;w.cursor++}for(;!w.out_grouping(l,97,246);){if(w.cursor>=w.limit)return;w.cursor++}o=w.cursor,o<a&&(o=a)}}function t(){var e,r=w.limit_backward;if(w.cursor>=o&&(w.limit_backward=o,w.cursor=w.limit,w.ket=w.cursor,e=w.find_among_b(u,37),w.limit_backward=r,e))switch(w.bra=w.cursor,e){case 1:w.slice_del();break;case 2:w.in_grouping_b(d,98,121)&&w.slice_del()}}function i(){var e=w.limit_backward;w.cursor>=o&&(w.limit_backward=o,w.cursor=w.limit,w.find_among_b(c,7)&&(w.cursor=w.limit,w.ket=w.cursor,w.cursor>w.limit_backward&&(w.bra=--w.cursor,w.slice_del())),w.limit_backward=e)}function s(){var e,r;if(w.cursor>=o){if(r=w.limit_backward,w.limit_backward=o,w.cursor=w.limit,w.ket=w.cursor,e=w.find_among_b(m,5))switch(w.bra=w.cursor,e){case 1:w.slice_del();break;case 2:w.slice_from("lös");break;case 3:w.slice_from("full")}w.limit_backward=r}}var a,o,u=[new r("a",-1,1),new r("arna",0,1),new r("erna",0,1),new r("heterna",2,1),new r("orna",0,1),new r("ad",-1,1),new r("e",-1,1),new r("ade",6,1),new r("ande",6,1),new r("arne",6,1),new r("are",6,1),new r("aste",6,1),new r("en",-1,1),new r("anden",12,1),new r("aren",12,1),new r("heten",12,1),new r("ern",-1,1),new r("ar",-1,1),new r("er",-1,1),new r("heter",18,1),new r("or",-1,1),new r("s",-1,2),new r("as",21,1),new r("arnas",22,1),new r("ernas",22,1),new r("ornas",22,1),new r("es",21,1),new r("ades",26,1),new r("andes",26,1),new r("ens",21,1),new r("arens",29,1),new r("hetens",29,1),new r("erns",21,1),new r("at",-1,1),new r("andet",-1,1),new r("het",-1,1),new r("ast",-1,1)],c=[new r("dd",-1,-1),new r("gd",-1,-1),new r("nn",-1,-1),new r("dt",-1,-1),new r("gt",-1,-1),new r("kt",-1,-1),new r("tt",-1,-1)],m=[new r("ig",-1,1),new r("lig",0,1),new r("els",-1,1),new r("fullt",-1,3),new r("löst",-1,2)],l=[17,65,16,1,0,0,0,0,0,0,0,0,0,0,0,0,24,0,32],d=[119,127,149],w=new n;this.setCurrent=function(e){w.setCurrent(e)},this.getCurrent=function(){return w.getCurrent()},this.stem=function(){var r=w.cursor;return e(),w.limit_backward=r,w.cursor=w.limit,t(),w.cursor=w.limit,i(),w.cursor=w.limit,s(),!0}};return function(e){return"function"==typeof e.update?e.update(function(e){return t.setCurrent(e),t.stem(),t.getCurrent()}):(t.setCurrent(e),t.stem(),t.getCurrent())}}(),e.Pipeline.registerFunction(e.sv.stemmer,"stemmer-sv"),e.sv.stopWordFilter=e.generateStopWordFilter("alla allt att av blev bli blir blivit de dem den denna deras dess dessa det detta dig din dina ditt du där då efter ej eller en er era ert ett från för ha hade han hans har henne hennes hon honom hur här i icke ingen inom inte jag ju kan kunde man med mellan men mig min mina mitt mot mycket ni nu när någon något några och om oss på samma sedan sig sin sina sitta själv skulle som så sådan sådana sådant till under upp ut utan vad var vara varför varit varje vars vart vem vi vid vilka vilkas vilken vilket vår våra vårt än är åt över".split(" ")),e.Pipeline.registerFunction(e.sv.stopWordFilter,"stopWordFilter-sv")}});
|
||||
1
v0.27.0/assets/javascripts/lunr/min/lunr.ta.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.ta.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
!function(e,t){"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():t()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.ta=function(){this.pipeline.reset(),this.pipeline.add(e.ta.trimmer,e.ta.stopWordFilter,e.ta.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.ta.stemmer))},e.ta.wordCharacters="-உஊ-ஏஐ-ஙச-ட-னப-யர-ஹ-ிீ-ொ-ௐ---௩௪-௯௰-௹௺-a-zA-Zａ-ｚＡ-Ｚ0-9０-９",e.ta.trimmer=e.trimmerSupport.generateTrimmer(e.ta.wordCharacters),e.Pipeline.registerFunction(e.ta.trimmer,"trimmer-ta"),e.ta.stopWordFilter=e.generateStopWordFilter("அங்கு அங்கே அது அதை அந்த அவர் அவர்கள் அவள் அவன் அவை ஆக ஆகவே ஆகையால் ஆதலால் ஆதலினால் ஆனாலும் ஆனால் இங்கு இங்கே இது இதை இந்த இப்படி இவர் இவர்கள் இவள் இவன் இவை இவ்வளவு உனக்கு உனது உன் உன்னால் எங்கு எங்கே எது எதை எந்த எப்படி எவர் எவர்கள் எவள் எவன் எவை எவ்வளவு எனக்கு எனது எனவே என் என்ன என்னால் ஏது ஏன் தனது தன்னால் தானே தான் நாங்கள் நாம் நான் நீ நீங்கள்".split(" ")),e.ta.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var t=e.wordcut;t.init(),e.ta.tokenizer=function(r){if(!arguments.length||null==r||void 0==r)return[];if(Array.isArray(r))return r.map(function(t){return isLunr2?new e.Token(t.toLowerCase()):t.toLowerCase()});var i=r.toString().toLowerCase().replace(/^\s+/,"");return t.cut(i).split("|")},e.Pipeline.registerFunction(e.ta.stemmer,"stemmer-ta"),e.Pipeline.registerFunction(e.ta.stopWordFilter,"stopWordFilter-ta")}});
|
||||
1
v0.27.0/assets/javascripts/lunr/min/lunr.te.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.te.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
!function(e,t){"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():t()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.te=function(){this.pipeline.reset(),this.pipeline.add(e.te.trimmer,e.te.stopWordFilter,e.te.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.te.stemmer))},e.te.wordCharacters="ఀ-ఄఅ-ఔక-హా-ౌౕ-ౖౘ-ౚౠ-ౡౢ-ౣ౦-౯౸-౿఼ఽ్ౝ౷",e.te.trimmer=e.trimmerSupport.generateTrimmer(e.te.wordCharacters),e.Pipeline.registerFunction(e.te.trimmer,"trimmer-te"),e.te.stopWordFilter=e.generateStopWordFilter("అందరూ అందుబాటులో అడగండి అడగడం అడ్డంగా అనుగుణంగా అనుమతించు అనుమతిస్తుంది అయితే ఇప్పటికే ఉన్నారు ఎక్కడైనా ఎప్పుడు ఎవరైనా ఎవరో ఏ ఏదైనా ఏమైనప్పటికి ఒక ఒకరు కనిపిస్తాయి కాదు కూడా గా గురించి చుట్టూ చేయగలిగింది తగిన తర్వాత దాదాపు దూరంగా నిజంగా పై ప్రకారం ప్రక్కన మధ్య మరియు మరొక మళ్ళీ మాత్రమే మెచ్చుకో వద్ద వెంట వేరుగా వ్యతిరేకంగా సంబంధం".split(" ")),e.te.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var t=e.wordcut;t.init(),e.te.tokenizer=function(r){if(!arguments.length||null==r||void 0==r)return[];if(Array.isArray(r))return r.map(function(t){return isLunr2?new e.Token(t.toLowerCase()):t.toLowerCase()});var i=r.toString().toLowerCase().replace(/^\s+/,"");return t.cut(i).split("|")},e.Pipeline.registerFunction(e.te.stemmer,"stemmer-te"),e.Pipeline.registerFunction(e.te.stopWordFilter,"stopWordFilter-te")}});
|
||||
1
v0.27.0/assets/javascripts/lunr/min/lunr.th.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.th.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");var r="2"==e.version[0];e.th=function(){this.pipeline.reset(),this.pipeline.add(e.th.trimmer),r?this.tokenizer=e.th.tokenizer:(e.tokenizer&&(e.tokenizer=e.th.tokenizer),this.tokenizerFn&&(this.tokenizerFn=e.th.tokenizer))},e.th.wordCharacters="[-]",e.th.trimmer=e.trimmerSupport.generateTrimmer(e.th.wordCharacters),e.Pipeline.registerFunction(e.th.trimmer,"trimmer-th");var t=e.wordcut;t.init(),e.th.tokenizer=function(i){if(!arguments.length||null==i||void 0==i)return[];if(Array.isArray(i))return i.map(function(t){return r?new e.Token(t):t});var n=i.toString().replace(/^\s+/,"");return t.cut(n).split("|")}}});
|
||||
18
v0.27.0/assets/javascripts/lunr/min/lunr.tr.min.js
vendored
Normal file
18
v0.27.0/assets/javascripts/lunr/min/lunr.tr.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.27.0/assets/javascripts/lunr/min/lunr.vi.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.vi.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.vi=function(){this.pipeline.reset(),this.pipeline.add(e.vi.stopWordFilter,e.vi.trimmer)},e.vi.wordCharacters="[A-Za-ẓ̀͐́͑̉̃̓ÂâÊêÔôĂ-ăĐ-đƠ-ơƯ-ư]",e.vi.trimmer=e.trimmerSupport.generateTrimmer(e.vi.wordCharacters),e.Pipeline.registerFunction(e.vi.trimmer,"trimmer-vi"),e.vi.stopWordFilter=e.generateStopWordFilter("là cái nhưng mà".split(" "))}});
|
||||
1
v0.27.0/assets/javascripts/lunr/min/lunr.zh.min.js
vendored
Normal file
1
v0.27.0/assets/javascripts/lunr/min/lunr.zh.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r(require("@node-rs/jieba")):r()(e.lunr)}(this,function(e){return function(r,t){if(void 0===r)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===r.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");var i="2"==r.version[0];r.zh=function(){this.pipeline.reset(),this.pipeline.add(r.zh.trimmer,r.zh.stopWordFilter,r.zh.stemmer),i?this.tokenizer=r.zh.tokenizer:(r.tokenizer&&(r.tokenizer=r.zh.tokenizer),this.tokenizerFn&&(this.tokenizerFn=r.zh.tokenizer))},r.zh.tokenizer=function(n){if(!arguments.length||null==n||void 0==n)return[];if(Array.isArray(n))return n.map(function(e){return i?new r.Token(e.toLowerCase()):e.toLowerCase()});t&&e.load(t);var o=n.toString().trim().toLowerCase(),s=[];e.cut(o,!0).forEach(function(e){s=s.concat(e.split(" "))}),s=s.filter(function(e){return!!e});var u=0;return s.map(function(e,t){if(i){var n=o.indexOf(e,u),s={};return s.position=[n,e.length],s.index=t,u=n,new r.Token(e,s)}return e})},r.zh.wordCharacters="\\w一-龥",r.zh.trimmer=r.trimmerSupport.generateTrimmer(r.zh.wordCharacters),r.Pipeline.registerFunction(r.zh.trimmer,"trimmer-zh"),r.zh.stemmer=function(){return function(e){return e}}(),r.Pipeline.registerFunction(r.zh.stemmer,"stemmer-zh"),r.zh.stopWordFilter=r.generateStopWordFilter("的 一 不 在 人 有 是 为 為 以 于 於 上 他 而 后 後 之 来 來 及 了 因 下 可 到 由 这 這 与 與 也 此 但 并 並 个 個 其 已 无 無 小 我 们 們 起 最 再 今 去 好 只 又 或 很 亦 某 把 那 你 乃 它 吧 被 比 别 趁 当 當 从 從 得 打 凡 儿 兒 尔 爾 该 該 各 给 給 跟 和 何 还 還 即 几 幾 既 看 据 據 距 靠 啦 另 么 麽 每 嘛 拿 哪 您 凭 憑 且 却 卻 让 讓 仍 啥 如 若 使 谁 誰 虽 雖 随 隨 同 所 她 哇 嗡 往 些 向 沿 哟 喲 用 咱 则 則 怎 曾 至 致 着 著 诸 諸 自".split(" ")),r.Pipeline.registerFunction(r.zh.stopWordFilter,"stopWordFilter-zh")}});
|
||||
206
v0.27.0/assets/javascripts/lunr/tinyseg.js
Normal file
206
v0.27.0/assets/javascripts/lunr/tinyseg.js
Normal file
@ -0,0 +1,206 @@
|
||||
/**
|
||||
* export the module via AMD, CommonJS or as a browser global
|
||||
* Export code from https://github.com/umdjs/umd/blob/master/returnExports.js
|
||||
*/
|
||||
;(function (root, factory) {
|
||||
if (typeof define === 'function' && define.amd) {
|
||||
// AMD. Register as an anonymous module.
|
||||
define(factory)
|
||||
} else if (typeof exports === 'object') {
|
||||
/**
|
||||
* Node. Does not work with strict CommonJS, but
|
||||
* only CommonJS-like environments that support module.exports,
|
||||
* like Node.
|
||||
*/
|
||||
module.exports = factory()
|
||||
} else {
|
||||
// Browser globals (root is window)
|
||||
factory()(root.lunr);
|
||||
}
|
||||
}(this, function () {
|
||||
/**
|
||||
* Just return a value to define the module export.
|
||||
* This example returns an object, but the module
|
||||
* can return a function as the exported value.
|
||||
*/
|
||||
|
||||
return function(lunr) {
|
||||
// TinySegmenter 0.1 -- Super compact Japanese tokenizer in Javascript
|
||||
// (c) 2008 Taku Kudo <taku@chasen.org>
|
||||
// TinySegmenter is freely distributable under the terms of a new BSD licence.
|
||||
// For details, see http://chasen.org/~taku/software/TinySegmenter/LICENCE.txt
|
||||
|
||||
function TinySegmenter() {
|
||||
var patterns = {
|
||||
"[一二三四五六七八九十百千万億兆]":"M",
|
||||
"[一-龠々〆ヵヶ]":"H",
|
||||
"[ぁ-ん]":"I",
|
||||
"[ァ-ヴーｱ-ﾝﾞｰ]":"K",
|
||||
"[a-zA-Zａ-ｚＡ-Ｚ]":"A",
|
||||
"[0-9０-９]":"N"
|
||||
}
|
||||
this.chartype_ = [];
|
||||
for (var i in patterns) {
|
||||
var regexp = new RegExp(i);
|
||||
this.chartype_.push([regexp, patterns[i]]);
|
||||
}
|
||||
|
||||
this.BIAS__ = -332
|
||||
this.BC1__ = {"HH":6,"II":2461,"KH":406,"OH":-1378};
|
||||
this.BC2__ = {"AA":-3267,"AI":2744,"AN":-878,"HH":-4070,"HM":-1711,"HN":4012,"HO":3761,"IA":1327,"IH":-1184,"II":-1332,"IK":1721,"IO":5492,"KI":3831,"KK":-8741,"MH":-3132,"MK":3334,"OO":-2920};
|
||||
this.BC3__ = {"HH":996,"HI":626,"HK":-721,"HN":-1307,"HO":-836,"IH":-301,"KK":2762,"MK":1079,"MM":4034,"OA":-1652,"OH":266};
|
||||
this.BP1__ = {"BB":295,"OB":304,"OO":-125,"UB":352};
|
||||
this.BP2__ = {"BO":60,"OO":-1762};
|
||||
this.BQ1__ = {"BHH":1150,"BHM":1521,"BII":-1158,"BIM":886,"BMH":1208,"BNH":449,"BOH":-91,"BOO":-2597,"OHI":451,"OIH":-296,"OKA":1851,"OKH":-1020,"OKK":904,"OOO":2965};
|
||||
this.BQ2__ = {"BHH":118,"BHI":-1159,"BHM":466,"BIH":-919,"BKK":-1720,"BKO":864,"OHH":-1139,"OHM":-181,"OIH":153,"UHI":-1146};
|
||||
this.BQ3__ = {"BHH":-792,"BHI":2664,"BII":-299,"BKI":419,"BMH":937,"BMM":8335,"BNN":998,"BOH":775,"OHH":2174,"OHM":439,"OII":280,"OKH":1798,"OKI":-793,"OKO":-2242,"OMH":-2402,"OOO":11699};
|
||||
this.BQ4__ = {"BHH":-3895,"BIH":3761,"BII":-4654,"BIK":1348,"BKK":-1806,"BMI":-3385,"BOO":-12396,"OAH":926,"OHH":266,"OHK":-2036,"ONN":-973};
|
||||
this.BW1__ = {",と":660,",同":727,"B1あ":1404,"B1同":542,"、と":660,"、同":727,"」と":1682,"あっ":1505,"いう":1743,"いっ":-2055,"いる":672,"うし":-4817,"うん":665,"から":3472,"がら":600,"こう":-790,"こと":2083,"こん":-1262,"さら":-4143,"さん":4573,"した":2641,"して":1104,"すで":-3399,"そこ":1977,"それ":-871,"たち":1122,"ため":601,"った":3463,"つい":-802,"てい":805,"てき":1249,"でき":1127,"です":3445,"では":844,"とい":-4915,"とみ":1922,"どこ":3887,"ない":5713,"なっ":3015,"など":7379,"なん":-1113,"にし":2468,"には":1498,"にも":1671,"に対":-912,"の一":-501,"の中":741,"ませ":2448,"まで":1711,"まま":2600,"まる":-2155,"やむ":-1947,"よっ":-2565,"れた":2369,"れで":-913,"をし":1860,"を見":731,"亡く":-1886,"京都":2558,"取り":-2784,"大き":-2604,"大阪":1497,"平方":-2314,"引き":-1336,"日本":-195,"本当":-2423,"毎日":-2113,"目指":-724,"Ｂ１あ":1404,"Ｂ１同":542,"｣と":1682};
|
||||
this.BW2__ = {"..":-11822,"11":-669,"――":-5730,"−−":-13175,"いう":-1609,"うか":2490,"かし":-1350,"かも":-602,"から":-7194,"かれ":4612,"がい":853,"がら":-3198,"きた":1941,"くな":-1597,"こと":-8392,"この":-4193,"させ":4533,"され":13168,"さん":-3977,"しい":-1819,"しか":-545,"した":5078,"して":972,"しな":939,"その":-3744,"たい":-1253,"たた":-662,"ただ":-3857,"たち":-786,"たと":1224,"たは":-939,"った":4589,"って":1647,"っと":-2094,"てい":6144,"てき":3640,"てく":2551,"ては":-3110,"ても":-3065,"でい":2666,"でき":-1528,"でし":-3828,"です":-4761,"でも":-4203,"とい":1890,"とこ":-1746,"とと":-2279,"との":720,"とみ":5168,"とも":-3941,"ない":-2488,"なが":-1313,"など":-6509,"なの":2614,"なん":3099,"にお":-1615,"にし":2748,"にな":2454,"によ":-7236,"に対":-14943,"に従":-4688,"に関":-11388,"のか":2093,"ので":-7059,"のに":-6041,"のの":-6125,"はい":1073,"はが":-1033,"はず":-2532,"ばれ":1813,"まし":-1316,"まで":-6621,"まれ":5409,"めて":-3153,"もい":2230,"もの":-10713,"らか":-944,"らし":-1611,"らに":-1897,"りし":651,"りま":1620,"れた":4270,"れて":849,"れば":4114,"ろう":6067,"われ":7901,"を通":-11877,"んだ":728,"んな":-4115,"一人":602,"一方":-1375,"一日":970,"一部":-1051,"上が":-4479,"会社":-1116,"出て":2163,"分の":-7758,"同党":970,"同日":-913,"大阪":-2471,"委員":-1250,"少な":-1050,"年度":-8669,"年間":-1626,"府県":-2363,"手権":-1982,"新聞":-4066,"日新":-722,"日本":-7068,"日米":3372,"曜日":-601,"朝鮮":-2355,"本人":-2697,"東京":-1543,"然と":-1384,"社会":-1276,"立て":-990,"第に":-1612,"米国":-4268,"１１":-669};
|
||||
this.BW3__ = {"あた":-2194,"あり":719,"ある":3846,"い.":-1185,"い。":-1185,"いい":5308,"いえ":2079,"いく":3029,"いた":2056,"いっ":1883,"いる":5600,"いわ":1527,"うち":1117,"うと":4798,"えと":1454,"か.":2857,"か。":2857,"かけ":-743,"かっ":-4098,"かに":-669,"から":6520,"かり":-2670,"が,":1816,"が、":1816,"がき":-4855,"がけ":-1127,"がっ":-913,"がら":-4977,"がり":-2064,"きた":1645,"けど":1374,"こと":7397,"この":1542,"ころ":-2757,"さい":-714,"さを":976,"し,":1557,"し、":1557,"しい":-3714,"した":3562,"して":1449,"しな":2608,"しま":1200,"す.":-1310,"す。":-1310,"する":6521,"ず,":3426,"ず、":3426,"ずに":841,"そう":428,"た.":8875,"た。":8875,"たい":-594,"たの":812,"たり":-1183,"たる":-853,"だ.":4098,"だ。":4098,"だっ":1004,"った":-4748,"って":300,"てい":6240,"てお":855,"ても":302,"です":1437,"でに":-1482,"では":2295,"とう":-1387,"とし":2266,"との":541,"とも":-3543,"どう":4664,"ない":1796,"なく":-903,"など":2135,"に,":-1021,"に、":-1021,"にし":1771,"にな":1906,"には":2644,"の,":-724,"の、":-724,"の子":-1000,"は,":1337,"は、":1337,"べき":2181,"まし":1113,"ます":6943,"まっ":-1549,"まで":6154,"まれ":-793,"らし":1479,"られ":6820,"るる":3818,"れ,":854,"れ、":854,"れた":1850,"れて":1375,"れば":-3246,"れる":1091,"われ":-605,"んだ":606,"んで":798,"カ月":990,"会議":860,"入り":1232,"大会":2217,"始め":1681,"市":965,"新聞":-5055,"日,":974,"日、":974,"社会":2024,"ｶ月":990};
|
||||
this.TC1__ = {"AAA":1093,"HHH":1029,"HHM":580,"HII":998,"HOH":-390,"HOM":-331,"IHI":1169,"IOH":-142,"IOI":-1015,"IOM":467,"MMH":187,"OOI":-1832};
|
||||
this.TC2__ = {"HHO":2088,"HII":-1023,"HMM":-1154,"IHI":-1965,"KKH":703,"OII":-2649};
|
||||
this.TC3__ = {"AAA":-294,"HHH":346,"HHI":-341,"HII":-1088,"HIK":731,"HOH":-1486,"IHH":128,"IHI":-3041,"IHO":-1935,"IIH":-825,"IIM":-1035,"IOI":-542,"KHH":-1216,"KKA":491,"KKH":-1217,"KOK":-1009,"MHH":-2694,"MHM":-457,"MHO":123,"MMH":-471,"NNH":-1689,"NNO":662,"OHO":-3393};
|
||||
this.TC4__ = {"HHH":-203,"HHI":1344,"HHK":365,"HHM":-122,"HHN":182,"HHO":669,"HIH":804,"HII":679,"HOH":446,"IHH":695,"IHO":-2324,"IIH":321,"III":1497,"IIO":656,"IOO":54,"KAK":4845,"KKA":3386,"KKK":3065,"MHH":-405,"MHI":201,"MMH":-241,"MMM":661,"MOM":841};
|
||||
this.TQ1__ = {"BHHH":-227,"BHHI":316,"BHIH":-132,"BIHH":60,"BIII":1595,"BNHH":-744,"BOHH":225,"BOOO":-908,"OAKK":482,"OHHH":281,"OHIH":249,"OIHI":200,"OIIH":-68};
|
||||
this.TQ2__ = {"BIHH":-1401,"BIII":-1033,"BKAK":-543,"BOOO":-5591};
|
||||
this.TQ3__ = {"BHHH":478,"BHHM":-1073,"BHIH":222,"BHII":-504,"BIIH":-116,"BIII":-105,"BMHI":-863,"BMHM":-464,"BOMH":620,"OHHH":346,"OHHI":1729,"OHII":997,"OHMH":481,"OIHH":623,"OIIH":1344,"OKAK":2792,"OKHH":587,"OKKA":679,"OOHH":110,"OOII":-685};
|
||||
this.TQ4__ = {"BHHH":-721,"BHHM":-3604,"BHII":-966,"BIIH":-607,"BIII":-2181,"OAAA":-2763,"OAKK":180,"OHHH":-294,"OHHI":2446,"OHHO":480,"OHIH":-1573,"OIHH":1935,"OIHI":-493,"OIIH":626,"OIII":-4007,"OKAK":-8156};
|
||||
this.TW1__ = {"につい":-4681,"東京都":2026};
|
||||
this.TW2__ = {"ある程":-2049,"いった":-1256,"ころが":-2434,"しょう":3873,"その後":-4430,"だって":-1049,"ていた":1833,"として":-4657,"ともに":-4517,"もので":1882,"一気に":-792,"初めて":-1512,"同時に":-8097,"大きな":-1255,"対して":-2721,"社会党":-3216};
|
||||
this.TW3__ = {"いただ":-1734,"してい":1314,"として":-4314,"につい":-5483,"にとっ":-5989,"に当た":-6247,"ので,":-727,"ので、":-727,"のもの":-600,"れから":-3752,"十二月":-2287};
|
||||
this.TW4__ = {"いう.":8576,"いう。":8576,"からな":-2348,"してい":2958,"たが,":1516,"たが、":1516,"ている":1538,"という":1349,"ました":5543,"ません":1097,"ようと":-4258,"よると":5865};
|
||||
this.UC1__ = {"A":484,"K":93,"M":645,"O":-505};
|
||||
this.UC2__ = {"A":819,"H":1059,"I":409,"M":3987,"N":5775,"O":646};
|
||||
this.UC3__ = {"A":-1370,"I":2311};
|
||||
this.UC4__ = {"A":-2643,"H":1809,"I":-1032,"K":-3450,"M":3565,"N":3876,"O":6646};
|
||||
this.UC5__ = {"H":313,"I":-1238,"K":-799,"M":539,"O":-831};
|
||||
this.UC6__ = {"H":-506,"I":-253,"K":87,"M":247,"O":-387};
|
||||
this.UP1__ = {"O":-214};
|
||||
this.UP2__ = {"B":69,"O":935};
|
||||
this.UP3__ = {"B":189};
|
||||
this.UQ1__ = {"BH":21,"BI":-12,"BK":-99,"BN":142,"BO":-56,"OH":-95,"OI":477,"OK":410,"OO":-2422};
|
||||
this.UQ2__ = {"BH":216,"BI":113,"OK":1759};
|
||||
this.UQ3__ = {"BA":-479,"BH":42,"BI":1913,"BK":-7198,"BM":3160,"BN":6427,"BO":14761,"OI":-827,"ON":-3212};
|
||||
this.UW1__ = {",":156,"、":156,"「":-463,"あ":-941,"う":-127,"が":-553,"き":121,"こ":505,"で":-201,"と":-547,"ど":-123,"に":-789,"の":-185,"は":-847,"も":-466,"や":-470,"よ":182,"ら":-292,"り":208,"れ":169,"を":-446,"ん":-137,"・":-135,"主":-402,"京":-268,"区":-912,"午":871,"国":-460,"大":561,"委":729,"市":-411,"日":-141,"理":361,"生":-408,"県":-386,"都":-718,"｢":-463,"･":-135};
|
||||
this.UW2__ = {",":-829,"、":-829,"〇":892,"「":-645,"」":3145,"あ":-538,"い":505,"う":134,"お":-502,"か":1454,"が":-856,"く":-412,"こ":1141,"さ":878,"ざ":540,"し":1529,"す":-675,"せ":300,"そ":-1011,"た":188,"だ":1837,"つ":-949,"て":-291,"で":-268,"と":-981,"ど":1273,"な":1063,"に":-1764,"の":130,"は":-409,"ひ":-1273,"べ":1261,"ま":600,"も":-1263,"や":-402,"よ":1639,"り":-579,"る":-694,"れ":571,"を":-2516,"ん":2095,"ア":-587,"カ":306,"キ":568,"ッ":831,"三":-758,"不":-2150,"世":-302,"中":-968,"主":-861,"事":492,"人":-123,"会":978,"保":362,"入":548,"初":-3025,"副":-1566,"北":-3414,"区":-422,"大":-1769,"天":-865,"太":-483,"子":-1519,"学":760,"実":1023,"小":-2009,"市":-813,"年":-1060,"強":1067,"手":-1519,"揺":-1033,"政":1522,"文":-1355,"新":-1682,"日":-1815,"明":-1462,"最":-630,"朝":-1843,"本":-1650,"東":-931,"果":-665,"次":-2378,"民":-180,"気":-1740,"理":752,"発":529,"目":-1584,"相":-242,"県":-1165,"立":-763,"第":810,"米":509,"自":-1353,"行":838,"西":-744,"見":-3874,"調":1010,"議":1198,"込":3041,"開":1758,"間":-1257,"｢":-645,"｣":3145,"ｯ":831,"ｱ":-587,"ｶ":306,"ｷ":568};
|
||||
this.UW3__ = {",":4889,"1":-800,"−":-1723,"、":4889,"々":-2311,"〇":5827,"」":2670,"〓":-3573,"あ":-2696,"い":1006,"う":2342,"え":1983,"お":-4864,"か":-1163,"が":3271,"く":1004,"け":388,"げ":401,"こ":-3552,"ご":-3116,"さ":-1058,"し":-395,"す":584,"せ":3685,"そ":-5228,"た":842,"ち":-521,"っ":-1444,"つ":-1081,"て":6167,"で":2318,"と":1691,"ど":-899,"な":-2788,"に":2745,"の":4056,"は":4555,"ひ":-2171,"ふ":-1798,"へ":1199,"ほ":-5516,"ま":-4384,"み":-120,"め":1205,"も":2323,"や":-788,"よ":-202,"ら":727,"り":649,"る":5905,"れ":2773,"わ":-1207,"を":6620,"ん":-518,"ア":551,"グ":1319,"ス":874,"ッ":-1350,"ト":521,"ム":1109,"ル":1591,"ロ":2201,"ン":278,"・":-3794,"一":-1619,"下":-1759,"世":-2087,"両":3815,"中":653,"主":-758,"予":-1193,"二":974,"人":2742,"今":792,"他":1889,"以":-1368,"低":811,"何":4265,"作":-361,"保":-2439,"元":4858,"党":3593,"全":1574,"公":-3030,"六":755,"共":-1880,"円":5807,"再":3095,"分":457,"初":2475,"別":1129,"前":2286,"副":4437,"力":365,"動":-949,"務":-1872,"化":1327,"北":-1038,"区":4646,"千":-2309,"午":-783,"協":-1006,"口":483,"右":1233,"各":3588,"合":-241,"同":3906,"和":-837,"員":4513,"国":642,"型":1389,"場":1219,"外":-241,"妻":2016,"学":-1356,"安":-423,"実":-1008,"家":1078,"小":-513,"少":-3102,"州":1155,"市":3197,"平":-1804,"年":2416,"広":-1030,"府":1605,"度":1452,"建":-2352,"当":-3885,"得":1905,"思":-1291,"性":1822,"戸":-488,"指":-3973,"政":-2013,"教":-1479,"数":3222,"文":-1489,"新":1764,"日":2099,"旧":5792,"昨":-661,"時":-1248,"曜":-951,"最":-937,"月":4125,"期":360,"李":3094,"村":364,"東":-805,"核":5156,"森":2438,"業":484,"氏":2613,"民":-1694,"決":-1073,"法":1868,"海":-495,"無":979,"物":461,"特":-3850,"生":-273,"用":914,"町":1215,"的":7313,"直":-1835,"省":792,"県":6293,"知":-1528,"私":4231,"税":401,"立":-960,"第":1201,"米":7767,"系":3066,"約":3663,"級":1384,"統":-4229,"総":1163,"線":1255,"者":6457,"能":725,"自":-2869,"英":785,"見":1044,"調":-562,"財":-733,"費":1777,"車":1835,"軍":1375,"込":-1504,"通":-1136,"選":-681,"郎":1026,"郡":4404,"部":1200,"金":2163,"長":421,"開":-1432,"間":1302,"関":-1282,"雨":2009,"電":-1045,"非":2066,"駅":1620,"１":-800,"｣":2670,"･":-3794,"ｯ":-1350,"ｱ":551,"ｸﾞ":1319,"ｽ":874,"ﾄ":521,"ﾑ":1109,"ﾙ":1591,"ﾛ":2201,"ﾝ":278};
|
||||
this.UW4__ = {",":3930,".":3508,"―":-4841,"、":3930,"。":3508,"〇":4999,"「":1895,"」":3798,"〓":-5156,"あ":4752,"い":-3435,"う":-640,"え":-2514,"お":2405,"か":530,"が":6006,"き":-4482,"ぎ":-3821,"く":-3788,"け":-4376,"げ":-4734,"こ":2255,"ご":1979,"さ":2864,"し":-843,"じ":-2506,"す":-731,"ず":1251,"せ":181,"そ":4091,"た":5034,"だ":5408,"ち":-3654,"っ":-5882,"つ":-1659,"て":3994,"で":7410,"と":4547,"な":5433,"に":6499,"ぬ":1853,"ね":1413,"の":7396,"は":8578,"ば":1940,"ひ":4249,"び":-4134,"ふ":1345,"へ":6665,"べ":-744,"ほ":1464,"ま":1051,"み":-2082,"む":-882,"め":-5046,"も":4169,"ゃ":-2666,"や":2795,"ょ":-1544,"よ":3351,"ら":-2922,"り":-9726,"る":-14896,"れ":-2613,"ろ":-4570,"わ":-1783,"を":13150,"ん":-2352,"カ":2145,"コ":1789,"セ":1287,"ッ":-724,"ト":-403,"メ":-1635,"ラ":-881,"リ":-541,"ル":-856,"ン":-3637,"・":-4371,"ー":-11870,"一":-2069,"中":2210,"予":782,"事":-190,"井":-1768,"人":1036,"以":544,"会":950,"体":-1286,"作":530,"側":4292,"先":601,"党":-2006,"共":-1212,"内":584,"円":788,"初":1347,"前":1623,"副":3879,"力":-302,"動":-740,"務":-2715,"化":776,"区":4517,"協":1013,"参":1555,"合":-1834,"和":-681,"員":-910,"器":-851,"回":1500,"国":-619,"園":-1200,"地":866,"場":-1410,"塁":-2094,"士":-1413,"多":1067,"大":571,"子":-4802,"学":-1397,"定":-1057,"寺":-809,"小":1910,"屋":-1328,"山":-1500,"島":-2056,"川":-2667,"市":2771,"年":374,"庁":-4556,"後":456,"性":553,"感":916,"所":-1566,"支":856,"改":787,"政":2182,"教":704,"文":522,"方":-856,"日":1798,"時":1829,"最":845,"月":-9066,"木":-485,"来":-442,"校":-360,"業":-1043,"氏":5388,"民":-2716,"気":-910,"沢":-939,"済":-543,"物":-735,"率":672,"球":-1267,"生":-1286,"産":-1101,"田":-2900,"町":1826,"的":2586,"目":922,"省":-3485,"県":2997,"空":-867,"立":-2112,"第":788,"米":2937,"系":786,"約":2171,"経":1146,"統":-1169,"総":940,"線":-994,"署":749,"者":2145,"能":-730,"般":-852,"行":-792,"規":792,"警":-1184,"議":-244,"谷":-1000,"賞":730,"車":-1481,"軍":1158,"輪":-1433,"込":-3370,"近":929,"道":-1291,"選":2596,"郎":-4866,"都":1192,"野":-1100,"銀":-2213,"長":357,"間":-2344,"院":-2297,"際":-2604,"電":-878,"領":-1659,"題":-792,"館":-1984,"首":1749,"高":2120,"｢":1895,"｣":3798,"･":-4371,"ｯ":-724,"ｰ":-11870,"ｶ":2145,"ｺ":1789,"ｾ":1287,"ﾄ":-403,"ﾒ":-1635,"ﾗ":-881,"ﾘ":-541,"ﾙ":-856,"ﾝ":-3637};
|
||||
this.UW5__ = {",":465,".":-299,"1":-514,"E2":-32768,"]":-2762,"、":465,"。":-299,"「":363,"あ":1655,"い":331,"う":-503,"え":1199,"お":527,"か":647,"が":-421,"き":1624,"ぎ":1971,"く":312,"げ":-983,"さ":-1537,"し":-1371,"す":-852,"だ":-1186,"ち":1093,"っ":52,"つ":921,"て":-18,"で":-850,"と":-127,"ど":1682,"な":-787,"に":-1224,"の":-635,"は":-578,"べ":1001,"み":502,"め":865,"ゃ":3350,"ょ":854,"り":-208,"る":429,"れ":504,"わ":419,"を":-1264,"ん":327,"イ":241,"ル":451,"ン":-343,"中":-871,"京":722,"会":-1153,"党":-654,"務":3519,"区":-901,"告":848,"員":2104,"大":-1296,"学":-548,"定":1785,"嵐":-1304,"市":-2991,"席":921,"年":1763,"思":872,"所":-814,"挙":1618,"新":-1682,"日":218,"月":-4353,"査":932,"格":1356,"機":-1508,"氏":-1347,"田":240,"町":-3912,"的":-3149,"相":1319,"省":-1052,"県":-4003,"研":-997,"社":-278,"空":-813,"統":1955,"者":-2233,"表":663,"語":-1073,"議":1219,"選":-1018,"郎":-368,"長":786,"間":1191,"題":2368,"館":-689,"１":-514,"Ｅ２":-32768,"｢":363,"ｲ":241,"ﾙ":451,"ﾝ":-343};
|
||||
this.UW6__ = {",":227,".":808,"1":-270,"E1":306,"、":227,"。":808,"あ":-307,"う":189,"か":241,"が":-73,"く":-121,"こ":-200,"じ":1782,"す":383,"た":-428,"っ":573,"て":-1014,"で":101,"と":-105,"な":-253,"に":-149,"の":-417,"は":-236,"も":-206,"り":187,"る":-135,"を":195,"ル":-673,"ン":-496,"一":-277,"中":201,"件":-800,"会":624,"前":302,"区":1792,"員":-1212,"委":798,"学":-960,"市":887,"広":-695,"後":535,"業":-697,"相":753,"社":-507,"福":974,"空":-822,"者":1811,"連":463,"郎":1082,"１":-270,"Ｅ１":306,"ﾙ":-673,"ﾝ":-496};
|
||||
|
||||
return this;
|
||||
}
|
||||
TinySegmenter.prototype.ctype_ = function(str) {
|
||||
for (var i in this.chartype_) {
|
||||
if (str.match(this.chartype_[i][0])) {
|
||||
return this.chartype_[i][1];
|
||||
}
|
||||
}
|
||||
return "O";
|
||||
}
|
||||
|
||||
TinySegmenter.prototype.ts_ = function(v) {
|
||||
if (v) { return v; }
|
||||
return 0;
|
||||
}
|
||||
|
||||
TinySegmenter.prototype.segment = function(input) {
|
||||
if (input == null || input == undefined || input == "") {
|
||||
return [];
|
||||
}
|
||||
var result = [];
|
||||
var seg = ["B3","B2","B1"];
|
||||
var ctype = ["O","O","O"];
|
||||
var o = input.split("");
|
||||
for (i = 0; i < o.length; ++i) {
|
||||
seg.push(o[i]);
|
||||
ctype.push(this.ctype_(o[i]))
|
||||
}
|
||||
seg.push("E1");
|
||||
seg.push("E2");
|
||||
seg.push("E3");
|
||||
ctype.push("O");
|
||||
ctype.push("O");
|
||||
ctype.push("O");
|
||||
var word = seg[3];
|
||||
var p1 = "U";
|
||||
var p2 = "U";
|
||||
var p3 = "U";
|
||||
for (var i = 4; i < seg.length - 3; ++i) {
|
||||
var score = this.BIAS__;
|
||||
var w1 = seg[i-3];
|
||||
var w2 = seg[i-2];
|
||||
var w3 = seg[i-1];
|
||||
var w4 = seg[i];
|
||||
var w5 = seg[i+1];
|
||||
var w6 = seg[i+2];
|
||||
var c1 = ctype[i-3];
|
||||
var c2 = ctype[i-2];
|
||||
var c3 = ctype[i-1];
|
||||
var c4 = ctype[i];
|
||||
var c5 = ctype[i+1];
|
||||
var c6 = ctype[i+2];
|
||||
score += this.ts_(this.UP1__[p1]);
|
||||
score += this.ts_(this.UP2__[p2]);
|
||||
score += this.ts_(this.UP3__[p3]);
|
||||
score += this.ts_(this.BP1__[p1 + p2]);
|
||||
score += this.ts_(this.BP2__[p2 + p3]);
|
||||
score += this.ts_(this.UW1__[w1]);
|
||||
score += this.ts_(this.UW2__[w2]);
|
||||
score += this.ts_(this.UW3__[w3]);
|
||||
score += this.ts_(this.UW4__[w4]);
|
||||
score += this.ts_(this.UW5__[w5]);
|
||||
score += this.ts_(this.UW6__[w6]);
|
||||
score += this.ts_(this.BW1__[w2 + w3]);
|
||||
score += this.ts_(this.BW2__[w3 + w4]);
|
||||
score += this.ts_(this.BW3__[w4 + w5]);
|
||||
score += this.ts_(this.TW1__[w1 + w2 + w3]);
|
||||
score += this.ts_(this.TW2__[w2 + w3 + w4]);
|
||||
score += this.ts_(this.TW3__[w3 + w4 + w5]);
|
||||
score += this.ts_(this.TW4__[w4 + w5 + w6]);
|
||||
score += this.ts_(this.UC1__[c1]);
|
||||
score += this.ts_(this.UC2__[c2]);
|
||||
score += this.ts_(this.UC3__[c3]);
|
||||
score += this.ts_(this.UC4__[c4]);
|
||||
score += this.ts_(this.UC5__[c5]);
|
||||
score += this.ts_(this.UC6__[c6]);
|
||||
score += this.ts_(this.BC1__[c2 + c3]);
|
||||
score += this.ts_(this.BC2__[c3 + c4]);
|
||||
score += this.ts_(this.BC3__[c4 + c5]);
|
||||
score += this.ts_(this.TC1__[c1 + c2 + c3]);
|
||||
score += this.ts_(this.TC2__[c2 + c3 + c4]);
|
||||
score += this.ts_(this.TC3__[c3 + c4 + c5]);
|
||||
score += this.ts_(this.TC4__[c4 + c5 + c6]);
|
||||
// score += this.ts_(this.TC5__[c4 + c5 + c6]);
|
||||
score += this.ts_(this.UQ1__[p1 + c1]);
|
||||
score += this.ts_(this.UQ2__[p2 + c2]);
|
||||
score += this.ts_(this.UQ3__[p3 + c3]);
|
||||
score += this.ts_(this.BQ1__[p2 + c2 + c3]);
|
||||
score += this.ts_(this.BQ2__[p2 + c3 + c4]);
|
||||
score += this.ts_(this.BQ3__[p3 + c2 + c3]);
|
||||
score += this.ts_(this.BQ4__[p3 + c3 + c4]);
|
||||
score += this.ts_(this.TQ1__[p2 + c1 + c2 + c3]);
|
||||
score += this.ts_(this.TQ2__[p2 + c2 + c3 + c4]);
|
||||
score += this.ts_(this.TQ3__[p3 + c1 + c2 + c3]);
|
||||
score += this.ts_(this.TQ4__[p3 + c2 + c3 + c4]);
|
||||
var p = "O";
|
||||
if (score > 0) {
|
||||
result.push(word);
|
||||
word = "";
|
||||
p = "B";
|
||||
}
|
||||
p1 = p2;
|
||||
p2 = p3;
|
||||
p3 = p;
|
||||
word += seg[i];
|
||||
}
|
||||
result.push(word);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
lunr.TinySegmenter = TinySegmenter;
|
||||
};
|
||||
|
||||
}));
|
||||
6708
v0.27.0/assets/javascripts/lunr/wordcut.js
Normal file
6708
v0.27.0/assets/javascripts/lunr/wordcut.js
Normal file
File diff suppressed because one or more lines are too long
42
v0.27.0/assets/javascripts/workers/search.f8cc74c7.min.js
vendored
Normal file
42
v0.27.0/assets/javascripts/workers/search.f8cc74c7.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
v0.27.0/assets/stylesheets/main.8608ea7d.min.css
vendored
Normal file
1
v0.27.0/assets/stylesheets/main.8608ea7d.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.27.0/assets/stylesheets/main.8608ea7d.min.css.map
Normal file
1
v0.27.0/assets/stylesheets/main.8608ea7d.min.css.map
Normal file
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user