mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-07 08:22:50 +00:00
Deployed dbbed2d to prerelease with MkDocs 1.5.2 and mike 1.1.2
This commit is contained in:
jj-docs[bot]
parent
7918b2571a
commit
abeb8bb05f
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/FAQ.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/FAQ.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/FAQ.html">../prerelease/FAQ.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/FAQ/index.html
Normal file
16
main/FAQ/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/FAQ/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/FAQ/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/FAQ/">../../prerelease/FAQ/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/branches.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/branches.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/branches.html">../prerelease/branches.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/branches/index.html
Normal file
16
main/branches/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/branches/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/branches/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/branches/">../../prerelease/branches/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/code-of-conduct.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/code-of-conduct.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/code-of-conduct.html">../prerelease/code-of-conduct.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/code-of-conduct/index.html
Normal file
16
main/code-of-conduct/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/code-of-conduct/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/code-of-conduct/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/code-of-conduct/">../../prerelease/code-of-conduct/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/config.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/config.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/config.html">../prerelease/config.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/config/index.html
Normal file
16
main/config/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/config/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/config/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/config/">../../prerelease/config/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/conflicts.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/conflicts.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/conflicts.html">../prerelease/conflicts.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/conflicts/index.html
Normal file
16
main/conflicts/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/conflicts/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/conflicts/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/conflicts/">../../prerelease/conflicts/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/contributing.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/contributing.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/contributing.html">../prerelease/contributing.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/contributing/index.html
Normal file
16
main/contributing/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/contributing/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/contributing/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/contributing/">../../prerelease/contributing/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/design/git-submodule-storage.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/design/git-submodule-storage.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/design/git-submodule-storage.html">../../prerelease/design/git-submodule-storage.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/design/git-submodule-storage/index.html
Normal file
16
main/design/git-submodule-storage/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../../prerelease/design/git-submodule-storage/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../../prerelease/design/git-submodule-storage/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../../prerelease/design/git-submodule-storage/">../../../prerelease/design/git-submodule-storage/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/design/git-submodules.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/design/git-submodules.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/design/git-submodules.html">../../prerelease/design/git-submodules.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/design/git-submodules/index.html
Normal file
16
main/design/git-submodules/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../../prerelease/design/git-submodules/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../../prerelease/design/git-submodules/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../../prerelease/design/git-submodules/">../../../prerelease/design/git-submodules/</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/design/run/index.html
Normal file
16
main/design/run/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../../prerelease/design/run/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../../prerelease/design/run/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../../prerelease/design/run/">../../../prerelease/design/run/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/design/tracking-branches.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/design/tracking-branches.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/design/tracking-branches.html">../../prerelease/design/tracking-branches.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/design/tracking-branches/index.html
Normal file
16
main/design/tracking-branches/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../../prerelease/design/tracking-branches/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../../prerelease/design/tracking-branches/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../../prerelease/design/tracking-branches/">../../../prerelease/design/tracking-branches/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/git-comparison.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/git-comparison.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/git-comparison.html">../prerelease/git-comparison.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -4,13 +4,13 @@
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/design/run.html" />
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/git-comparison/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/design/run.html" + window.location.hash);
|
||||
window.location.replace("../../prerelease/git-comparison/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/design/run.html">../../prerelease/design/run.html</a>...
|
||||
Redirecting to <a href="../../prerelease/git-comparison/">../../prerelease/git-comparison/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/git-compatibility.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/git-compatibility.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/git-compatibility.html">../prerelease/git-compatibility.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/git-compatibility/index.html
Normal file
16
main/git-compatibility/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/git-compatibility/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/git-compatibility/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/git-compatibility/">../../prerelease/git-compatibility/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/github.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/github.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/github.html">../prerelease/github.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/github/index.html
Normal file
16
main/github/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/github/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/github/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/github/">../../prerelease/github/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/glossary.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/glossary.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/glossary.html">../prerelease/glossary.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/glossary/index.html
Normal file
16
main/glossary/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/glossary/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/glossary/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/glossary/">../../prerelease/glossary/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/install-and-setup.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/install-and-setup.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/install-and-setup.html">../prerelease/install-and-setup.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/install-and-setup/index.html
Normal file
16
main/install-and-setup/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/install-and-setup/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/install-and-setup/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/install-and-setup/">../../prerelease/install-and-setup/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/operation-log.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/operation-log.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/operation-log.html">../prerelease/operation-log.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/operation-log/index.html
Normal file
16
main/operation-log/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/operation-log/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/operation-log/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/operation-log/">../../prerelease/operation-log/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/related-work.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/related-work.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/related-work.html">../prerelease/related-work.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/related-work/index.html
Normal file
16
main/related-work/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/related-work/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/related-work/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/related-work/">../../prerelease/related-work/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/revsets.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/revsets.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/revsets.html">../prerelease/revsets.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/revsets/index.html
Normal file
16
main/revsets/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/revsets/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/revsets/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/revsets/">../../prerelease/revsets/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/sapling-comparison.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/sapling-comparison.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/sapling-comparison.html">../prerelease/sapling-comparison.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/sapling-comparison/index.html
Normal file
16
main/sapling-comparison/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/sapling-comparison/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/sapling-comparison/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/sapling-comparison/">../../prerelease/sapling-comparison/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/technical/architecture.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/technical/architecture.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/technical/architecture.html">../../prerelease/technical/architecture.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/technical/architecture/index.html
Normal file
16
main/technical/architecture/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../../prerelease/technical/architecture/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../../prerelease/technical/architecture/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../../prerelease/technical/architecture/">../../../prerelease/technical/architecture/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/technical/concurrency.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/technical/concurrency.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/technical/concurrency.html">../../prerelease/technical/concurrency.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/technical/concurrency/index.html
Normal file
16
main/technical/concurrency/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../../prerelease/technical/concurrency/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../../prerelease/technical/concurrency/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../../prerelease/technical/concurrency/">../../../prerelease/technical/concurrency/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/technical/conflicts.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/technical/conflicts.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/technical/conflicts.html">../../prerelease/technical/conflicts.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/technical/conflicts/index.html
Normal file
16
main/technical/conflicts/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../../prerelease/technical/conflicts/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../../prerelease/technical/conflicts/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../../prerelease/technical/conflicts/">../../../prerelease/technical/conflicts/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/templates.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/templates.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/templates.html">../prerelease/templates.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/templates/index.html
Normal file
16
main/templates/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/templates/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/templates/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/templates/">../../prerelease/templates/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/tutorial.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/tutorial.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/tutorial.html">../prerelease/tutorial.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/tutorial/index.html
Normal file
16
main/tutorial/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/tutorial/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/tutorial/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/tutorial/">../../prerelease/tutorial/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -1,16 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../prerelease/working-copy.html" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../prerelease/working-copy.html" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../prerelease/working-copy.html">../prerelease/working-copy.html</a>...
|
||||
</body>
|
||||
</html>
|
||||
16
main/working-copy/index.html
Normal file
16
main/working-copy/index.html
Normal file
@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting</title>
|
||||
<noscript>
|
||||
<meta http-equiv="refresh" content="1; url=../../prerelease/working-copy/" />
|
||||
</noscript>
|
||||
<script>
|
||||
window.location.replace("../../prerelease/working-copy/" + window.location.hash);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Redirecting to <a href="../../prerelease/working-copy/">../../prerelease/working-copy/</a>...
|
||||
</body>
|
||||
</html>
|
||||
@ -28,8 +28,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -221,7 +219,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/install-and-setup.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -241,7 +239,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/tutorial.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -261,7 +259,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/github.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -288,7 +286,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/FAQ.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -341,7 +339,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/working-copy.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -361,7 +359,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/branches.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -381,7 +379,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/conflicts.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -401,7 +399,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/operation-log.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -421,7 +419,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/glossary.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -482,7 +480,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/config.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -502,7 +500,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/revsets.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -522,7 +520,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/templates.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -583,7 +581,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/git-comparison.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -603,7 +601,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/git-compatibility.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -623,7 +621,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/sapling-comparison.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -643,7 +641,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/related-work.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -704,7 +702,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/technical/architecture.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -724,7 +722,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/technical/concurrency.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -744,7 +742,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/technical/conflicts.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -805,7 +803,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/contributing.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -825,7 +823,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/code-of-conduct.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -886,7 +884,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/design/git-submodules.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -906,7 +904,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -926,7 +924,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/design/run.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -946,7 +944,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="/jj/prerelease/design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="/jj/prerelease/design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/FAQ.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/FAQ/">
|
||||
|
||||
|
||||
<link rel="prev" href="github.html">
|
||||
<link rel="prev" href="../github/">
|
||||
|
||||
|
||||
<link rel="next" href="working-copy.html">
|
||||
<link rel="next" href="../working-copy/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -319,7 +317,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="FAQ.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -455,7 +453,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -475,7 +473,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -495,7 +493,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -515,7 +513,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -535,7 +533,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -596,7 +594,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -616,7 +614,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -636,7 +634,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -697,7 +695,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -717,7 +715,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -737,7 +735,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -757,7 +755,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -818,7 +816,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -838,7 +836,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -858,7 +856,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -919,7 +917,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -939,7 +937,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1000,7 +998,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1020,7 +1018,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1040,7 +1038,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1060,7 +1058,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1202,14 +1200,14 @@ options:</p>
|
||||
<h3 id="where-is-my-commit-why-is-it-not-visible-in-jj-log">Where is my commit, why is it not visible in <code>jj log</code>?<a class="headerlink" href="#where-is-my-commit-why-is-it-not-visible-in-jj-log" title="Permanent link">¶</a></h3>
|
||||
<p>Is your commit visible with <code>jj log -r 'all()'</code>?</p>
|
||||
<p>If yes, you should be aware that <code>jj log</code> only shows the revisions matching
|
||||
<code>revsets.log</code> by default. You can change it as described in <a href="config.html">config</a> to show
|
||||
<code>revsets.log</code> by default. You can change it as described in <a href="../config/">config</a> to show
|
||||
more revisions.</p>
|
||||
<p>If not, the revision may have been abandoned (e.g. because you
|
||||
used <code>jj abandon</code>, or because it's an obsolete version that's been rewritten
|
||||
with <code>jj rebase</code>, <code>jj describe</code>, etc). In that case, <code>jj log -r commit_id</code>
|
||||
should show the revision as "hidden". <code>jj new commit_id</code> should make the
|
||||
revision visible again.</p>
|
||||
<p>See <a href="revsets.html">revsets</a> and <a href="templates.html">templates</a> for further guidance.</p>
|
||||
<p>See <a href="../revsets/">revsets</a> and <a href="../templates/">templates</a> for further guidance.</p>
|
||||
<h3 id="can-i-prevent-jujutsu-from-recording-my-unfinished-work-im-not-ready-to-commit-it">Can I prevent Jujutsu from recording my unfinished work? I'm not ready to commit it.<a class="headerlink" href="#can-i-prevent-jujutsu-from-recording-my-unfinished-work-im-not-ready-to-commit-it" title="Permanent link">¶</a></h3>
|
||||
<p>Jujutsu automatically records new files in the current working-copy commit and
|
||||
doesn't provide a way to prevent that.</p>
|
||||
@ -1298,10 +1296,10 @@ commit to the new state.</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/branches.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/branches/">
|
||||
|
||||
|
||||
<link rel="prev" href="working-copy.html">
|
||||
<link rel="prev" href="../working-copy/">
|
||||
|
||||
|
||||
<link rel="next" href="conflicts.html">
|
||||
<link rel="next" href="../conflicts/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -354,7 +352,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -394,7 +392,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="branches.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -455,7 +453,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -475,7 +473,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -495,7 +493,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -556,7 +554,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -576,7 +574,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -596,7 +594,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -657,7 +655,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -677,7 +675,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -697,7 +695,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -717,7 +715,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -778,7 +776,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -798,7 +796,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -818,7 +816,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -879,7 +877,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -899,7 +897,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -960,7 +958,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -980,7 +978,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1000,7 +998,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1020,7 +1018,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1193,10 +1191,10 @@ propagate to the local branch (which was presumably also conflicted).</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/code-of-conduct.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/code-of-conduct/">
|
||||
|
||||
|
||||
<link rel="prev" href="contributing.html">
|
||||
<link rel="prev" href="../contributing/">
|
||||
|
||||
|
||||
<link rel="next" href="design/git-submodules.html">
|
||||
<link rel="next" href="../design/git-submodules/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -493,7 +491,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -513,7 +511,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -533,7 +531,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -594,7 +592,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -614,7 +612,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -634,7 +632,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -654,7 +652,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -715,7 +713,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -735,7 +733,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -755,7 +753,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -818,7 +816,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -858,7 +856,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="code-of-conduct.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -981,7 +979,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1001,7 +999,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1021,7 +1019,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1041,7 +1039,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1259,10 +1257,10 @@ https://www.contributor-covenant.org/version/1/4/code-of-conduct.html</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/config.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/config/">
|
||||
|
||||
|
||||
<link rel="prev" href="glossary.html">
|
||||
<link rel="prev" href="../glossary/">
|
||||
|
||||
|
||||
<link rel="next" href="revsets.html">
|
||||
<link rel="next" href="../revsets/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -515,7 +513,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="config.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -821,7 +819,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -841,7 +839,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -902,7 +900,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -922,7 +920,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -942,7 +940,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -962,7 +960,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1023,7 +1021,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1043,7 +1041,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1063,7 +1061,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1124,7 +1122,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1144,7 +1142,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1205,7 +1203,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1225,7 +1223,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1245,7 +1243,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1265,7 +1263,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -2052,10 +2050,10 @@ files with the config specified in <code>.jjconfig.toml</code>:</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/conflicts.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/conflicts/">
|
||||
|
||||
|
||||
<link rel="prev" href="branches.html">
|
||||
<link rel="prev" href="../branches/">
|
||||
|
||||
|
||||
<link rel="next" href="operation-log.html">
|
||||
<link rel="next" href="../operation-log/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -354,7 +352,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -374,7 +372,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -414,7 +412,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="conflicts.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -475,7 +473,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -495,7 +493,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -556,7 +554,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -576,7 +574,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -596,7 +594,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -657,7 +655,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -677,7 +675,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -697,7 +695,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -717,7 +715,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -778,7 +776,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -798,7 +796,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -818,7 +816,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -879,7 +877,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -899,7 +897,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -960,7 +958,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -980,7 +978,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1000,7 +998,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1020,7 +1018,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1113,7 +1111,7 @@ the conflict whenever you want. Conflicted states can be further rebased,
|
||||
merged, or backed out. Note that what's stored in the commit is a logical
|
||||
representation of the conflict, not conflict <em>markers</em>; rebasing a conflict
|
||||
doesn't result in a nested conflict markers (see
|
||||
<a href="technical/conflicts.html">technical doc</a> for how this works).</p>
|
||||
<a href="../technical/conflicts/">technical doc</a> for how this works).</p>
|
||||
<h2 id="advantages">Advantages<a class="headerlink" href="#advantages" title="Permanent link">¶</a></h2>
|
||||
<p>The deeper understanding of conflicts has many advantages:</p>
|
||||
<ul>
|
||||
@ -1145,7 +1143,7 @@ doesn't result in a nested conflict markers (see
|
||||
interact with your project using Git.)</li>
|
||||
</ul>
|
||||
<p>For information about how conflicts are handled in the working copy, see
|
||||
<a href="working-copy.html#conflicts">here</a>.</p>
|
||||
<a href="../working-copy/#conflicts">here</a>.</p>
|
||||
<h2 id="conflict-markers">Conflict markers<a class="headerlink" href="#conflict-markers" title="Permanent link">¶</a></h2>
|
||||
<p>Conflicts are "materialized" using <em>conflict markers</em> in various contexts. For
|
||||
example, when you run <code>jj edit</code> on a commit with a conflict, it will be
|
||||
@ -1234,10 +1232,10 @@ diff onto the snapshot.</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/contributing.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/contributing/">
|
||||
|
||||
|
||||
<link rel="prev" href="technical/conflicts.html">
|
||||
<link rel="prev" href="../technical/conflicts/">
|
||||
|
||||
|
||||
<link rel="next" href="code-of-conduct.html">
|
||||
<link rel="next" href="../code-of-conduct/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -493,7 +491,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -513,7 +511,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -533,7 +531,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -594,7 +592,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -614,7 +612,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -634,7 +632,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -654,7 +652,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -715,7 +713,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -735,7 +733,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -755,7 +753,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -838,7 +836,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="contributing.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1014,7 +1012,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1075,7 +1073,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1095,7 +1093,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1115,7 +1113,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1135,7 +1133,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1648,10 +1646,10 @@ there.</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/design/git-submodule-storage.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/design/git-submodule-storage/">
|
||||
|
||||
|
||||
<link rel="prev" href="git-submodules.html">
|
||||
<link rel="prev" href="../git-submodules/">
|
||||
|
||||
|
||||
<link rel="next" href="run.html">
|
||||
<link rel="next" href="../run/">
|
||||
|
||||
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<link rel="icon" href="../../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("../..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../install-and-setup.html" class="md-nav__link">
|
||||
<a href="../../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../tutorial.html" class="md-nav__link">
|
||||
<a href="../../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../github.html" class="md-nav__link">
|
||||
<a href="../../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../FAQ.html" class="md-nav__link">
|
||||
<a href="../../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../working-copy.html" class="md-nav__link">
|
||||
<a href="../../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../branches.html" class="md-nav__link">
|
||||
<a href="../../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../conflicts.html" class="md-nav__link">
|
||||
<a href="../../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../operation-log.html" class="md-nav__link">
|
||||
<a href="../../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../glossary.html" class="md-nav__link">
|
||||
<a href="../../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -493,7 +491,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../config.html" class="md-nav__link">
|
||||
<a href="../../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -513,7 +511,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../revsets.html" class="md-nav__link">
|
||||
<a href="../../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -533,7 +531,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../templates.html" class="md-nav__link">
|
||||
<a href="../../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -594,7 +592,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-comparison.html" class="md-nav__link">
|
||||
<a href="../../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -614,7 +612,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-compatibility.html" class="md-nav__link">
|
||||
<a href="../../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -634,7 +632,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -654,7 +652,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../related-work.html" class="md-nav__link">
|
||||
<a href="../../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -715,7 +713,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../technical/architecture.html" class="md-nav__link">
|
||||
<a href="../../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -735,7 +733,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -755,7 +753,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -816,7 +814,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../contributing.html" class="md-nav__link">
|
||||
<a href="../../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -836,7 +834,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -899,7 +897,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-submodules.html" class="md-nav__link">
|
||||
<a href="../git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -939,7 +937,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="git-submodule-storage.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1095,7 +1093,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="run.html" class="md-nav__link">
|
||||
<a href="../run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1115,7 +1113,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tracking-branches.html" class="md-nav__link">
|
||||
<a href="../tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1296,10 +1294,10 @@
|
||||
<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.
|
||||
The decision will be recorded in <a href="git-submodules.html">./git-submodules.md</a>.</p>
|
||||
The decision will be recorded in <a href="../git-submodules/">./git-submodules.md</a>.</p>
|
||||
<h2 id="use-cases-to-consider">Use cases to consider<a class="headerlink" href="#use-cases-to-consider" title="Permanent link">¶</a></h2>
|
||||
<p>The submodule storage format should support the workflows specified in the
|
||||
<a href="git-submodules.html">submodules roadmap</a>. It should be obvious how "Phase 1"
|
||||
<a href="../git-submodules/">submodules roadmap</a>. It should be obvious how "Phase 1"
|
||||
requirements will be supported, and we should have an idea of how "Phases 2,3,X"
|
||||
might be supported.</p>
|
||||
<p>Notable use cases and workflows are noted below.</p>
|
||||
@ -1439,10 +1437,10 @@ represent a nested submodule's relationship to its superproject.</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/design/git-submodules.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/design/git-submodules/">
|
||||
|
||||
|
||||
<link rel="prev" href="../code-of-conduct.html">
|
||||
<link rel="prev" href="../../code-of-conduct/">
|
||||
|
||||
|
||||
<link rel="next" href="git-submodule-storage.html">
|
||||
<link rel="next" href="../git-submodule-storage/">
|
||||
|
||||
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<link rel="icon" href="../../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("../..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../install-and-setup.html" class="md-nav__link">
|
||||
<a href="../../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../tutorial.html" class="md-nav__link">
|
||||
<a href="../../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../github.html" class="md-nav__link">
|
||||
<a href="../../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../FAQ.html" class="md-nav__link">
|
||||
<a href="../../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../working-copy.html" class="md-nav__link">
|
||||
<a href="../../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../branches.html" class="md-nav__link">
|
||||
<a href="../../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../conflicts.html" class="md-nav__link">
|
||||
<a href="../../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../operation-log.html" class="md-nav__link">
|
||||
<a href="../../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../glossary.html" class="md-nav__link">
|
||||
<a href="../../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -493,7 +491,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../config.html" class="md-nav__link">
|
||||
<a href="../../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -513,7 +511,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../revsets.html" class="md-nav__link">
|
||||
<a href="../../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -533,7 +531,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../templates.html" class="md-nav__link">
|
||||
<a href="../../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -594,7 +592,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-comparison.html" class="md-nav__link">
|
||||
<a href="../../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -614,7 +612,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-compatibility.html" class="md-nav__link">
|
||||
<a href="../../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -634,7 +632,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -654,7 +652,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../related-work.html" class="md-nav__link">
|
||||
<a href="../../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -715,7 +713,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../technical/architecture.html" class="md-nav__link">
|
||||
<a href="../../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -735,7 +733,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -755,7 +753,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -816,7 +814,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../contributing.html" class="md-nav__link">
|
||||
<a href="../../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -836,7 +834,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -919,7 +917,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="git-submodules.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1120,7 +1118,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1140,7 +1138,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="run.html" class="md-nav__link">
|
||||
<a href="../run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1160,7 +1158,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tracking-branches.html" class="md-nav__link">
|
||||
<a href="../tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1506,7 +1504,7 @@ amount of design work on its own.</p>
|
||||
<p>TODO</p>
|
||||
<h3 id="storing-submodules">Storing submodules<a class="headerlink" href="#storing-submodules" title="Permanent link">¶</a></h3>
|
||||
<p>Possible approaches under discussion. See
|
||||
<a href="git-submodule-storage.html">./git-submodule-storage.md</a>.</p>
|
||||
<a href="../git-submodule-storage/">./git-submodule-storage.md</a>.</p>
|
||||
<h3 id="snapshotting-new-submodule-changes">Snapshotting new submodule changes<a class="headerlink" href="#snapshotting-new-submodule-changes" title="Permanent link">¶</a></h3>
|
||||
<p>TODO</p>
|
||||
<h3 id="mergingrebasing-with-submodules">Merging/rebasing with submodules<a class="headerlink" href="#mergingrebasing-with-submodules" title="Permanent link">¶</a></h3>
|
||||
@ -1548,10 +1546,10 @@ amount of design work on its own.</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/design/run.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/design/run/">
|
||||
|
||||
|
||||
<link rel="prev" href="git-submodule-storage.html">
|
||||
<link rel="prev" href="../git-submodule-storage/">
|
||||
|
||||
|
||||
<link rel="next" href="tracking-branches.html">
|
||||
<link rel="next" href="../tracking-branches/">
|
||||
|
||||
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<link rel="icon" href="../../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("../..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../install-and-setup.html" class="md-nav__link">
|
||||
<a href="../../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../tutorial.html" class="md-nav__link">
|
||||
<a href="../../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../github.html" class="md-nav__link">
|
||||
<a href="../../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../FAQ.html" class="md-nav__link">
|
||||
<a href="../../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../working-copy.html" class="md-nav__link">
|
||||
<a href="../../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../branches.html" class="md-nav__link">
|
||||
<a href="../../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../conflicts.html" class="md-nav__link">
|
||||
<a href="../../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../operation-log.html" class="md-nav__link">
|
||||
<a href="../../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../glossary.html" class="md-nav__link">
|
||||
<a href="../../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -493,7 +491,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../config.html" class="md-nav__link">
|
||||
<a href="../../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -513,7 +511,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../revsets.html" class="md-nav__link">
|
||||
<a href="../../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -533,7 +531,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../templates.html" class="md-nav__link">
|
||||
<a href="../../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -594,7 +592,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-comparison.html" class="md-nav__link">
|
||||
<a href="../../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -614,7 +612,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-compatibility.html" class="md-nav__link">
|
||||
<a href="../../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -634,7 +632,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -654,7 +652,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../related-work.html" class="md-nav__link">
|
||||
<a href="../../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -715,7 +713,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../technical/architecture.html" class="md-nav__link">
|
||||
<a href="../../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -735,7 +733,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -755,7 +753,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -816,7 +814,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../contributing.html" class="md-nav__link">
|
||||
<a href="../../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -836,7 +834,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -899,7 +897,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-submodules.html" class="md-nav__link">
|
||||
<a href="../git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -919,7 +917,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -959,7 +957,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="run.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1143,7 +1141,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tracking-branches.html" class="md-nav__link">
|
||||
<a href="../tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1601,10 +1599,10 @@ user and incrementally updating the output of <code>jj st</code>. </li>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/design/tracking-branches.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/design/tracking-branches/">
|
||||
|
||||
|
||||
<link rel="prev" href="run.html">
|
||||
<link rel="prev" href="../run/">
|
||||
|
||||
|
||||
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<link rel="icon" href="../../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -32,8 +32,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -45,7 +43,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("../..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -87,7 +85,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -179,7 +177,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -230,7 +228,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../install-and-setup.html" class="md-nav__link">
|
||||
<a href="../../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -250,7 +248,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../tutorial.html" class="md-nav__link">
|
||||
<a href="../../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -270,7 +268,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../github.html" class="md-nav__link">
|
||||
<a href="../../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -297,7 +295,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../FAQ.html" class="md-nav__link">
|
||||
<a href="../../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -350,7 +348,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../working-copy.html" class="md-nav__link">
|
||||
<a href="../../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -370,7 +368,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../branches.html" class="md-nav__link">
|
||||
<a href="../../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -390,7 +388,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../conflicts.html" class="md-nav__link">
|
||||
<a href="../../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -410,7 +408,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../operation-log.html" class="md-nav__link">
|
||||
<a href="../../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -430,7 +428,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../glossary.html" class="md-nav__link">
|
||||
<a href="../../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -491,7 +489,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../config.html" class="md-nav__link">
|
||||
<a href="../../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -511,7 +509,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../revsets.html" class="md-nav__link">
|
||||
<a href="../../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -531,7 +529,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../templates.html" class="md-nav__link">
|
||||
<a href="../../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -592,7 +590,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-comparison.html" class="md-nav__link">
|
||||
<a href="../../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -612,7 +610,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-compatibility.html" class="md-nav__link">
|
||||
<a href="../../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -632,7 +630,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -652,7 +650,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../related-work.html" class="md-nav__link">
|
||||
<a href="../../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -713,7 +711,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../technical/architecture.html" class="md-nav__link">
|
||||
<a href="../../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -733,7 +731,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -753,7 +751,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -814,7 +812,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../contributing.html" class="md-nav__link">
|
||||
<a href="../../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -834,7 +832,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -897,7 +895,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-submodules.html" class="md-nav__link">
|
||||
<a href="../git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -917,7 +915,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -937,7 +935,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="run.html" class="md-nav__link">
|
||||
<a href="../run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -977,7 +975,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="tracking-branches.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1771,10 +1769,10 @@ In particular, a merge of local and remote targets is
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/git-comparison.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/git-comparison/">
|
||||
|
||||
|
||||
<link rel="prev" href="templates.html">
|
||||
<link rel="prev" href="../templates/">
|
||||
|
||||
|
||||
<link rel="next" href="git-compatibility.html">
|
||||
<link rel="next" href="../git-compatibility/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -493,7 +491,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -513,7 +511,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -533,7 +531,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -616,7 +614,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="git-comparison.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -684,7 +682,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -704,7 +702,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -724,7 +722,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -785,7 +783,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -805,7 +803,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -825,7 +823,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -886,7 +884,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -906,7 +904,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -967,7 +965,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -987,7 +985,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1007,7 +1005,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1027,7 +1025,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1120,7 +1118,7 @@
|
||||
<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.html">the Git-compatibility doc</a> for information about how
|
||||
<a href="../git-compatibility/">the Git-compatibility doc</a> for information about how
|
||||
the <code>jj</code> command interoperates with Git repos.</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
|
||||
@ -1130,7 +1128,7 @@ 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
|
||||
commit. <a href="working-copy.html">Details</a>.</li>
|
||||
commit. <a href="../working-copy/">Details</a>.</li>
|
||||
<li><strong>There's no index (staging area).</strong> That also results in a simpler
|
||||
CLI for similar reasons. The index is very similar to an intermediate commit
|
||||
between <code>HEAD</code> and the working copy, so workflows that depend on it can be
|
||||
@ -1149,7 +1147,7 @@ various use cases.</p>
|
||||
branch.</li>
|
||||
<li><strong>Conflicts can be committed.</strong> No commands fail because of merge conflicts.
|
||||
The conflicts are instead recorded in commits and you can resolve them later.
|
||||
<a href="conflicts.html">Details</a>.</li>
|
||||
<a href="../conflicts/">Details</a>.</li>
|
||||
<li><strong>Descendant commits are automatically rebased.</strong> Whenever you rewrite a
|
||||
commit (e.g. by running <code>jj rebase</code>), all its descendants commits will
|
||||
automatically be rebased on top. Branches pointing to it will also get
|
||||
@ -1159,12 +1157,12 @@ various use cases.</p>
|
||||
you pull from a remote that has a <code>main</code> branch, you'll get a branch by that
|
||||
name in your local repo as well. If you then move it and push back to the
|
||||
remote, the <code>main</code> branch on the remote will be updated.
|
||||
<a href="branches.html">Details</a>.</li>
|
||||
<a href="../branches/">Details</a>.</li>
|
||||
<li><strong>The operation log replaces reflogs.</strong> The operation log is similar to
|
||||
reflogs, but is much more powerful. It keeps track of atomic updates to all
|
||||
refs at once (Jujutsu thus improves on Git's per-ref history much in the same
|
||||
way that Subversion improved on RCS's per-file history). The operation log
|
||||
powers e.g. the undo functionality. <a href="operation-log.html">Details</a></li>
|
||||
powers e.g. the undo functionality. <a href="../operation-log/">Details</a></li>
|
||||
<li><strong>There's a single, virtual root commit.</strong> Like Mercurial, Jujutsu has a
|
||||
virtual commit (with a hash consisting of only zeros) called the "root commit"
|
||||
(called the "null revision" in Mercurial). This commit is a common ancestor of
|
||||
@ -1475,10 +1473,10 @@ parent.</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/git-compatibility.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/git-compatibility/">
|
||||
|
||||
|
||||
<link rel="prev" href="git-comparison.html">
|
||||
<link rel="prev" href="../git-comparison/">
|
||||
|
||||
|
||||
<link rel="next" href="sapling-comparison.html">
|
||||
<link rel="next" href="../sapling-comparison/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -493,7 +491,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -513,7 +511,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -533,7 +531,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -596,7 +594,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -636,7 +634,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="git-compatibility.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -738,7 +736,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -758,7 +756,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -819,7 +817,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -839,7 +837,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -859,7 +857,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -920,7 +918,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -940,7 +938,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1001,7 +999,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1021,7 +1019,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1041,7 +1039,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1061,7 +1059,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1195,7 +1193,7 @@ briefer help).</p>
|
||||
<h2 id="supported-features">Supported features<a class="headerlink" href="#supported-features" title="Permanent link">¶</a></h2>
|
||||
<p>The following list describes which Git features Jujutsu is compatible with. For
|
||||
a comparison with Git, including how workflows are different, see the
|
||||
<a href="git-comparison.html">Git-comparison doc</a>.</p>
|
||||
<a href="../git-comparison/">Git-comparison doc</a>.</p>
|
||||
<ul>
|
||||
<li><strong>Configuration: Partial.</strong> The only configuration from Git (e.g. in
|
||||
<code>~/.gitconfig</code>) that's respected is the following. Feel free to file a bug if
|
||||
@ -1206,7 +1204,7 @@ a comparison with Git, including how workflows are different, see the
|
||||
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>Branches: Yes.</strong> You can read more about
|
||||
<a href="branches.html">how branches work in Jujutsu</a>
|
||||
<a href="../branches/">how branches work in Jujutsu</a>
|
||||
and <a href="#branches">how they interoperate with Git</a>.</li>
|
||||
<li><strong>Tags: Partial.</strong> You can check out tagged commits by name (pointed to be
|
||||
either annotated or lightweight tags), but you cannot create new tags.</li>
|
||||
@ -1289,7 +1287,7 @@ repos may require you to deal with more involved Jujutsu and Git concepts.</p>
|
||||
<ul>
|
||||
<li>
|
||||
<p>Interleaving <code>jj</code> and <code>git</code> commands increases the chance of confusing branch
|
||||
conflicts or <a href="glossary.html#divergent-change">conflicted (AKA divergent) change
|
||||
conflicts or <a href="../glossary/#divergent-change">conflicted (AKA divergent) change
|
||||
ids</a>. These never lose data, but can be
|
||||
annoying.</p>
|
||||
<p>Such interleaving can happen unknowingly. For example, some IDEs can cause
|
||||
@ -1321,7 +1319,7 @@ repos may require you to deal with more involved Jujutsu and Git concepts.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Colocated repositories are less resilient to
|
||||
<a href="technical/concurrency.html#syncing-with-rsync-nfs-dropbox-etc">concurrency</a>
|
||||
<a href="../technical/concurrency/#syncing-with-rsync-nfs-dropbox-etc">concurrency</a>
|
||||
issues if you share the repo using an NFS filesystem or Dropbox. In general,
|
||||
such use of Jujutsu is not currently thoroughly tested.</p>
|
||||
</li>
|
||||
@ -1397,10 +1395,10 @@ information about the conflict. They are not meant to be human-readable.</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/github.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/github/">
|
||||
|
||||
|
||||
<link rel="prev" href="tutorial.html">
|
||||
<link rel="prev" href="../tutorial/">
|
||||
|
||||
|
||||
<link rel="next" href="FAQ.html">
|
||||
<link rel="next" href="../FAQ/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -234,7 +232,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -254,7 +252,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -294,7 +292,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="github.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -458,7 +456,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -511,7 +509,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -531,7 +529,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -551,7 +549,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -571,7 +569,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -591,7 +589,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -652,7 +650,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -672,7 +670,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -692,7 +690,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -753,7 +751,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -773,7 +771,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -793,7 +791,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -813,7 +811,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -874,7 +872,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -894,7 +892,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -914,7 +912,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -975,7 +973,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -995,7 +993,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1056,7 +1054,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1076,7 +1074,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1096,7 +1094,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1116,7 +1114,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1420,10 +1418,10 @@ the remote. This means that if you want to iterate or test another
|
||||
contributor's branch you can <code>jj new <branchname></code> onto it.</p>
|
||||
<p>If your remote has a large amount of old, inactive branches or this feature is
|
||||
undesirable, set <code>git.auto-local-branch = false</code> in the config file.</p>
|
||||
<p>You can find more information on that setting <a href="config.html#automatic-local-branch-creation">here</a>.</p>
|
||||
<p>You can find more information on that setting <a href="../config/#automatic-local-branch-creation">here</a>.</p>
|
||||
<h2 id="using-github-cli">Using GitHub CLI<a class="headerlink" href="#using-github-cli" title="Permanent link">¶</a></h2>
|
||||
<p>GitHub CLI will have trouble finding the proper git repository path in jj repos
|
||||
that aren't <a href="git-compatibility.html#co-located-jujutsugit-repos">co-located</a>
|
||||
that aren't <a href="../git-compatibility/#co-located-jujutsugit-repos">co-located</a>
|
||||
(see <a href="https://github.com/martinvonz/jj/issues/1008">issue #1008</a>). You can configure the <code>$GIT_DIR</code> environment variable to
|
||||
point it to the right path:</p>
|
||||
<div class="highlight"><pre><span></span><code>$<span class="w"> </span><span class="nv">GIT_DIR</span><span class="o">=</span>.jj/repo/store/git<span class="w"> </span>gh<span class="w"> </span>issue<span class="w"> </span>list
|
||||
@ -1449,7 +1447,7 @@ Log all descendants of the current working copy, which aren't on a remote
|
||||
<code>jj log -r '::@ & ~remote_branches()'</code></p>
|
||||
<h2 id="merge-conflicts">Merge conflicts<a class="headerlink" href="#merge-conflicts" title="Permanent link">¶</a></h2>
|
||||
<p>For a detailed overview, how Jujutsu handles conflicts, revisit
|
||||
the <a href="tutorial.html#Conflicts">tutorial</a>.</p>
|
||||
the <a href="../tutorial/#Conflicts">tutorial</a>.</p>
|
||||
<h2 id="using-several-remotes">Using several remotes<a class="headerlink" href="#using-several-remotes" title="Permanent link">¶</a></h2>
|
||||
<p>It is common to use several remotes when contributing to a shared repository.
|
||||
For example,
|
||||
@ -1515,10 +1513,10 @@ e.g. <a href="https://jg.gg/2018/09/29/stacked-diffs-versus-pull-requests/">this
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/glossary.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/glossary/">
|
||||
|
||||
|
||||
<link rel="prev" href="operation-log.html">
|
||||
<link rel="prev" href="../operation-log/">
|
||||
|
||||
|
||||
<link rel="next" href="config.html">
|
||||
<link rel="next" href="../config/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -354,7 +352,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -374,7 +372,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -394,7 +392,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -414,7 +412,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -454,7 +452,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="glossary.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -710,7 +708,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -730,7 +728,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -750,7 +748,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -811,7 +809,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -831,7 +829,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -851,7 +849,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -871,7 +869,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -932,7 +930,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -952,7 +950,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -972,7 +970,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1033,7 +1031,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1053,7 +1051,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1114,7 +1112,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1134,7 +1132,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1154,7 +1152,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1174,7 +1172,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1434,7 +1432,7 @@ the commit if it gets <a href="#rewrite">rewritten</a>. Branches are sometimes c
|
||||
<a href="#anonymous-branch">anonymous branches</a>, but note that they are more similar
|
||||
to Git's branches than to
|
||||
<a href="https://www.mercurial-scm.org/wiki/Branch#Named_branches">Mercurial's named branches</a>.
|
||||
See <a href="branches.html">here</a> for details.</p>
|
||||
See <a href="../branches/">here</a> for details.</p>
|
||||
<h2 id="change">Change<a class="headerlink" href="#change" title="Permanent link">¶</a></h2>
|
||||
<p>A change is a commit as it <a href="#rewrite">evolves over time</a>.</p>
|
||||
<h2 id="change-id">Change ID<a class="headerlink" href="#change-id" title="Permanent link">¶</a></h2>
|
||||
@ -1468,16 +1466,16 @@ default. When using the Git backend, the commit ID is the Git commit ID.</p>
|
||||
directory is a sibling of <code>.jj/</code>, we call the repository "co-located". Most
|
||||
tools designed for Git can be easily used on such repositories. <code>jj</code> and <code>git</code>
|
||||
commands can be used interchangeably.</p>
|
||||
<p>See <a href="git-compatibility.html#co-located-jujutsugit-repos">here</a> for details.</p>
|
||||
<p>See <a href="../git-compatibility/#co-located-jujutsugit-repos">here</a> for details.</p>
|
||||
<h2 id="conflict">Conflict<a class="headerlink" href="#conflict" title="Permanent link">¶</a></h2>
|
||||
<p>Conflicts can occur in many places. The most common type is conflicts in files.
|
||||
Those are the conflicts that users coming from other VCSs are usually familiar
|
||||
with. You can see them in <code>jj status</code> and in <code>jj log</code> (the red "conflict"
|
||||
label at the end of the line). See <a href="conflicts.html">here</a> for details.</p>
|
||||
label at the end of the line). See <a href="../conflicts/">here</a> for details.</p>
|
||||
<p>Conflicts can also occur in <a href="#branch">branches</a>. For example, if you moved a
|
||||
branch locally, and it was also moved on the remote, then the branch will be
|
||||
in a conflicted state after you pull from the remote.
|
||||
See <a href="branches.html#conflicts">here</a> for details.</p>
|
||||
See <a href="../branches/#conflicts">here</a> for details.</p>
|
||||
<p>Similar to a branch conflict, when a <a href="#change">change</a> is rewritten locally
|
||||
and remotely, for example, then the change will be in a conflicted state. We
|
||||
call that a <a href="#divergent-change">divergent change</a>.</p>
|
||||
@ -1487,7 +1485,7 @@ call that a <a href="#divergent-change">divergent change</a>.</p>
|
||||
<h2 id="head">Head<a class="headerlink" href="#head" title="Permanent link">¶</a></h2>
|
||||
<p>A head is a commit with no descendants. The context in which it has no
|
||||
descendants varies. For example, the <code>heads(X)</code>
|
||||
<a href="revsets.html#functions">revset function</a> returns commits that have no descendants
|
||||
<a href="../revsets/#functions">revset function</a> returns commits that have no descendants
|
||||
within the set <code>X</code> itself. The <a href="#view">view</a> records which
|
||||
anonymous heads (heads without a branch pointing to them) are visible at a
|
||||
given <a href="#operation">operation</a>. Note that this is quite different from Git's
|
||||
@ -1513,7 +1511,7 @@ and <a href="#commit">commits</a>.</p>
|
||||
<p>A synonym for <a href="#commit">Commit</a>.</p>
|
||||
<h2 id="revset">Revset<a class="headerlink" href="#revset" title="Permanent link">¶</a></h2>
|
||||
<p>Jujutsu supports a functional language for selecting a set of revisions.
|
||||
Expressions in this language are called "revsets". See <a href="revsets.html">here</a> for
|
||||
Expressions in this language are called "revsets". See <a href="../revsets/">here</a> for
|
||||
details. We also often use the term "revset" for the set of revisions selected
|
||||
by a revset.</p>
|
||||
<h2 id="rewrite">Rewrite<a class="headerlink" href="#rewrite" title="Permanent link">¶</a></h2>
|
||||
@ -1551,7 +1549,7 @@ associated <a href="#repository">repository</a>. There can be multiple workspace
|
||||
single repository. Each workspace has a <code>.jj/</code> directory, but the
|
||||
<a href="#commit">commits</a> and <a href="#operation">operations</a> will be stored in the initial
|
||||
workspace; the other workspaces will have pointers to the initial workspace. See
|
||||
<a href="working-copy.html#workspaces">here</a> for details.</p>
|
||||
<a href="../working-copy/#workspaces">here</a> for details.</p>
|
||||
<p>This is what Git calls a "worktree".</p>
|
||||
<h2 id="working-copy">Working copy<a class="headerlink" href="#working-copy" title="Permanent link">¶</a></h2>
|
||||
<p>The working copy contains the files you're currently working on. It is
|
||||
@ -1559,7 +1557,7 @@ automatically snapshot at the beginning of almost every <code>jj</code> command,
|
||||
creating a new <a href="#working-copy-commit">working-copy commit</a> if any changes had
|
||||
been made in the working copy. Conversely, the working copy is automatically
|
||||
updated to the state of the working-copy commit at the end of almost every <code>jj</code>
|
||||
command. See <a href="working-copy.html">here</a> for details.</p>
|
||||
command. See <a href="../working-copy/">here</a> for details.</p>
|
||||
<p>This is what Git calls a "working tree".</p>
|
||||
<h2 id="working-copy-commit">Working-copy commit<a class="headerlink" href="#working-copy-commit" title="Permanent link">¶</a></h2>
|
||||
<p>A commit that corresponds to the current state of the working copy. There is
|
||||
@ -1602,10 +1600,10 @@ commits are tracked in the <a href="#operation-log">operation log</a>.</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -4,10 +4,10 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting...</title>
|
||||
<link rel="canonical" href="install-and-setup.html">
|
||||
<link rel="canonical" href="install-and-setup/">
|
||||
<meta name="robots" content="noindex">
|
||||
<script>var anchor=window.location.hash.substr(1);location.href="install-and-setup.html"+(anchor?"#"+anchor:"")</script>
|
||||
<meta http-equiv="refresh" content="0; url=install-and-setup.html">
|
||||
<script>var anchor=window.location.hash.substr(1);location.href="install-and-setup/"+(anchor?"#"+anchor:"")</script>
|
||||
<meta http-equiv="refresh" content="0; url=install-and-setup/">
|
||||
</head>
|
||||
<body>
|
||||
Redirecting...
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/install-and-setup.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/install-and-setup/">
|
||||
|
||||
|
||||
|
||||
<link rel="next" href="tutorial.html">
|
||||
<link rel="next" href="../tutorial/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -32,8 +32,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -45,7 +43,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -87,7 +85,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -179,7 +177,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -252,7 +250,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="install-and-setup.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -435,7 +433,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -455,7 +453,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -482,7 +480,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -535,7 +533,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -555,7 +553,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -575,7 +573,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -595,7 +593,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -615,7 +613,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -676,7 +674,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -696,7 +694,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -716,7 +714,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -777,7 +775,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -797,7 +795,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -817,7 +815,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -837,7 +835,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -898,7 +896,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -918,7 +916,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -938,7 +936,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -999,7 +997,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1019,7 +1017,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1080,7 +1078,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1100,7 +1098,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1120,7 +1118,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1140,7 +1138,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1480,10 +1478,10 @@ compinit
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/operation-log.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/operation-log/">
|
||||
|
||||
|
||||
<link rel="prev" href="conflicts.html">
|
||||
<link rel="prev" href="../conflicts/">
|
||||
|
||||
|
||||
<link rel="next" href="glossary.html">
|
||||
<link rel="next" href="../glossary/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -354,7 +352,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -374,7 +372,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -394,7 +392,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -434,7 +432,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="operation-log.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -495,7 +493,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -556,7 +554,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -576,7 +574,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -596,7 +594,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -657,7 +655,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -677,7 +675,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -697,7 +695,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -717,7 +715,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -778,7 +776,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -798,7 +796,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -818,7 +816,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -879,7 +877,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -899,7 +897,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -960,7 +958,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -980,7 +978,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1000,7 +998,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1020,7 +1018,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1188,10 +1186,10 @@ than to simulate concurrent commands.</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/related-work.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/related-work/">
|
||||
|
||||
|
||||
<link rel="prev" href="sapling-comparison.html">
|
||||
<link rel="prev" href="../sapling-comparison/">
|
||||
|
||||
|
||||
<link rel="next" href="technical/architecture.html">
|
||||
<link rel="next" href="../technical/architecture/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -493,7 +491,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -513,7 +511,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -533,7 +531,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -596,7 +594,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -616,7 +614,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -636,7 +634,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -665,7 +663,7 @@
|
||||
|
||||
|
||||
|
||||
<a href="related-work.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -727,7 +725,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -747,7 +745,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -767,7 +765,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -828,7 +826,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -848,7 +846,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -909,7 +907,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -929,7 +927,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -949,7 +947,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -969,7 +967,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1034,7 +1032,7 @@
|
||||
<a href="https://www.mercurial-scm.org/">Mercurial</a> developed and used at Meta. It
|
||||
is compatible with Git, has undo functionality, and
|
||||
<a href="https://sapling-scm.com/docs/addons/isl">a graphical interface</a>.
|
||||
See <a href="sapling-comparison.html">how it is different from Jujutsu</a>.</li>
|
||||
See <a href="../sapling-comparison/">how it is different from Jujutsu</a>.</li>
|
||||
<li><a href="https://gitup.co/">GitUp</a>: A Mac-only GUI for Git. Like Jujutsu, supports
|
||||
undo and restoring the repo to an earlier snapshot. Backed by its
|
||||
<a href="https://github.com/git-up/GitUp#gitupkit">GitUpKit library</a>.</li>
|
||||
@ -1087,10 +1085,10 @@
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/revsets.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/revsets/">
|
||||
|
||||
|
||||
<link rel="prev" href="config.html">
|
||||
<link rel="prev" href="../config/">
|
||||
|
||||
|
||||
<link rel="next" href="templates.html">
|
||||
<link rel="next" href="../templates/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -495,7 +493,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -535,7 +533,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="revsets.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -643,7 +641,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -704,7 +702,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -724,7 +722,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -744,7 +742,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -764,7 +762,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -825,7 +823,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -845,7 +843,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -865,7 +863,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -926,7 +924,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -946,7 +944,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1007,7 +1005,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1027,7 +1025,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1047,7 +1045,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1067,7 +1065,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1349,7 +1347,7 @@ for a comprehensive list.</p>
|
||||
tried. If more than one potential trunk commit exists, the newest one is
|
||||
chosen. If none of the branches exist, the revset evaluates to <code>root()</code>.</li>
|
||||
</ul>
|
||||
<p>You can <a href="config.html">override</a> this as appropriate. If you do, make sure it
|
||||
<p>You can <a href="../config/">override</a> this as appropriate. If you do, make sure it
|
||||
always resolves to exactly one commit. For example:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[revset-aliases]</span>
|
||||
<span class="s">'trunk()'</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">'your-branch@your-remote'</span>
|
||||
@ -1418,10 +1416,10 @@ description:</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/sapling-comparison.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/sapling-comparison/">
|
||||
|
||||
|
||||
<link rel="prev" href="git-compatibility.html">
|
||||
<link rel="prev" href="../git-compatibility/">
|
||||
|
||||
|
||||
<link rel="next" href="related-work.html">
|
||||
<link rel="next" href="../related-work/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -493,7 +491,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -513,7 +511,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -533,7 +531,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -596,7 +594,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -616,7 +614,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -656,7 +654,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="sapling-comparison.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -710,7 +708,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -771,7 +769,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -791,7 +789,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -811,7 +809,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -872,7 +870,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -892,7 +890,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -953,7 +951,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -973,7 +971,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -993,7 +991,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1013,7 +1011,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1098,11 +1096,11 @@ jj has copied many ideas from Mercurial, there are many similarities between the
|
||||
two tools, such as:</p>
|
||||
<ul>
|
||||
<li>A user-friendly CLI</li>
|
||||
<li>A "<a href="revsets.html">revset</a>" language for selecting revisions</li>
|
||||
<li>A "<a href="../revsets/">revset</a>" language for selecting revisions</li>
|
||||
<li>Good support for working with stacked commits, including tracking "anonymous
|
||||
heads" (no "detached HEAD" state like in Git) and <code>split</code> commands, and
|
||||
automatically rebasing descendant commits when you amend a commit.</li>
|
||||
<li>Flexible customization of output using <a href="templates.html">templates</a></li>
|
||||
<li>Flexible customization of output using <a href="../templates/">templates</a></li>
|
||||
</ul>
|
||||
<h2 id="differences">Differences<a class="headerlink" href="#differences" title="Permanent link">¶</a></h2>
|
||||
<p>Here is a list of some differences between jj and Sapling.</p>
|
||||
@ -1110,7 +1108,7 @@ two tools, such as:</p>
|
||||
<li><strong>Working copy:</strong> When using Sapling (like most VCSs), the
|
||||
user explicitly tells the tool when to create a commit and which files to
|
||||
include. When using jj, the working copy
|
||||
is <a href="working-copy.html">automatically snapshotted by every command</a>. New files
|
||||
is <a href="../working-copy/">automatically snapshotted by every command</a>. New files
|
||||
are automatically tracked and deleted files are automatically untracked. This
|
||||
has several advantages:<ul>
|
||||
<li>The working copy is effectively backed up every time you run a command.</li>
|
||||
@ -1122,7 +1120,7 @@ two tools, such as:</p>
|
||||
</li>
|
||||
<li><strong>Conflicts:</strong> Like most VCSs, Sapling requires the user to
|
||||
resolve conflicts before committing. jj lets
|
||||
you <a href="conflicts.html">commit conflicts</a>. Note that it's a representation of the
|
||||
you <a href="../conflicts/">commit conflicts</a>. Note that it's a representation of the
|
||||
conflict that's committed, not conflict markers (<code><<<<<<<</code> etc.). This also
|
||||
has several advantages:<ul>
|
||||
<li>Merge conflicts won't prevent you from checking out another commit.</li>
|
||||
@ -1133,7 +1131,7 @@ two tools, such as:</p>
|
||||
<li>You can rebase conflicts and conflict resolutions.</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><strong>Undo:</strong> jj's undo is powered by <a href="operation-log.html">the operation log</a>, which
|
||||
<li><strong>Undo:</strong> jj's undo is powered by <a href="../operation-log/">the operation log</a>, which
|
||||
records how the repo has changed over time. Sapling has a similar feature
|
||||
with its <a href="https://sapling-scm.com/docs/internals/metalog">MetaLog</a>.
|
||||
They seem to provide similar functionality, but jj also exposes the log to the
|
||||
@ -1201,10 +1199,10 @@ two tools, such as:</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.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
@ -1,127 +1,127 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/FAQ.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/FAQ/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/branches.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/branches/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/code-of-conduct.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/code-of-conduct/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/config.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/config/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/conflicts.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/conflicts/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/contributing.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/contributing/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/git-comparison.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/git-comparison/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/git-compatibility.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/git-compatibility/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/github.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/github/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/glossary.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/glossary/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/install-and-setup.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/install-and-setup/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/operation-log.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/operation-log/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/related-work.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/related-work/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/revsets.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/revsets/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/sapling-comparison.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/sapling-comparison/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/templates.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/templates/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/tutorial.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/tutorial/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/working-copy.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/working-copy/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodule-storage.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodule-storage/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodules.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodules/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/run.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/run/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/tracking-branches.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/tracking-branches/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/architecture.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/architecture/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/concurrency.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/concurrency/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/conflicts.html</loc>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/conflicts/</loc>
|
||||
<lastmod>2023-10-03</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
|
||||
Binary file not shown.
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/technical/architecture.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/technical/architecture/">
|
||||
|
||||
|
||||
<link rel="prev" href="../related-work.html">
|
||||
<link rel="prev" href="../../related-work/">
|
||||
|
||||
|
||||
<link rel="next" href="concurrency.html">
|
||||
<link rel="next" href="../concurrency/">
|
||||
|
||||
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<link rel="icon" href="../../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("../..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../install-and-setup.html" class="md-nav__link">
|
||||
<a href="../../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../tutorial.html" class="md-nav__link">
|
||||
<a href="../../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../github.html" class="md-nav__link">
|
||||
<a href="../../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../FAQ.html" class="md-nav__link">
|
||||
<a href="../../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../working-copy.html" class="md-nav__link">
|
||||
<a href="../../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../branches.html" class="md-nav__link">
|
||||
<a href="../../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../conflicts.html" class="md-nav__link">
|
||||
<a href="../../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../operation-log.html" class="md-nav__link">
|
||||
<a href="../../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../glossary.html" class="md-nav__link">
|
||||
<a href="../../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -493,7 +491,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../config.html" class="md-nav__link">
|
||||
<a href="../../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -513,7 +511,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../revsets.html" class="md-nav__link">
|
||||
<a href="../../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -533,7 +531,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../templates.html" class="md-nav__link">
|
||||
<a href="../../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -594,7 +592,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-comparison.html" class="md-nav__link">
|
||||
<a href="../../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -614,7 +612,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-compatibility.html" class="md-nav__link">
|
||||
<a href="../../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -634,7 +632,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -654,7 +652,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../related-work.html" class="md-nav__link">
|
||||
<a href="../../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -737,7 +735,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="architecture.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -943,7 +941,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="concurrency.html" class="md-nav__link">
|
||||
<a href="../concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -963,7 +961,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1024,7 +1022,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../contributing.html" class="md-nav__link">
|
||||
<a href="../../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1044,7 +1042,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1105,7 +1103,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1125,7 +1123,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1145,7 +1143,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../design/run.html" class="md-nav__link">
|
||||
<a href="../../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1165,7 +1163,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1549,7 +1547,7 @@ implementation.</p>
|
||||
<p><code>StackedTable</code> (actually <code>ReadonlyTable</code> and <code>MutableTable</code>) is a simple disk
|
||||
format for storing key-value pairs sorted by key. The keys have to have the same
|
||||
size but the values can have different sizes. We use our own format because we
|
||||
want <a href="concurrency.html">lock-free concurrency</a> and there doesn't seem to be an
|
||||
want <a href="../concurrency/">lock-free concurrency</a> and there doesn't seem to be an
|
||||
existing key-value store we could use.</p>
|
||||
<p>The file format contains a lookup table followed by concatenated values. The
|
||||
lookup table is a sorted list of keys, where each key is followed by the
|
||||
@ -1565,7 +1563,7 @@ results in O(log N) amortized insertion time and lookup time.</p>
|
||||
<p>There's no garbage collection of unreachable tables yet.</p>
|
||||
<p>The tables are named by their hash. We keep a separate directory of pointers to
|
||||
the current leaf tables, in the same way as we
|
||||
do <a href="concurrency.html#storage">for the operation log</a>.</p>
|
||||
do <a href="../concurrency/#storage">for the operation log</a>.</p>
|
||||
<h2 id="design-of-the-cli-crate">Design of the CLI crate<a class="headerlink" href="#design-of-the-cli-crate" title="Permanent link">¶</a></h2>
|
||||
<h3 id="templates">Templates<a class="headerlink" href="#templates" title="Permanent link">¶</a></h3>
|
||||
<p>The concept is copied from Mercurial, but the syntax is different. The main
|
||||
@ -1623,10 +1621,10 @@ upgrades of the repo format <a class="footnote-backref" href="#fnref:1" tit
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/technical/concurrency.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/technical/concurrency/">
|
||||
|
||||
|
||||
<link rel="prev" href="architecture.html">
|
||||
<link rel="prev" href="../architecture/">
|
||||
|
||||
|
||||
<link rel="next" href="conflicts.html">
|
||||
<link rel="next" href="../conflicts/">
|
||||
|
||||
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<link rel="icon" href="../../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("../..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../install-and-setup.html" class="md-nav__link">
|
||||
<a href="../../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../tutorial.html" class="md-nav__link">
|
||||
<a href="../../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../github.html" class="md-nav__link">
|
||||
<a href="../../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../FAQ.html" class="md-nav__link">
|
||||
<a href="../../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../working-copy.html" class="md-nav__link">
|
||||
<a href="../../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../branches.html" class="md-nav__link">
|
||||
<a href="../../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../conflicts.html" class="md-nav__link">
|
||||
<a href="../../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../operation-log.html" class="md-nav__link">
|
||||
<a href="../../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../glossary.html" class="md-nav__link">
|
||||
<a href="../../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -493,7 +491,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../config.html" class="md-nav__link">
|
||||
<a href="../../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -513,7 +511,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../revsets.html" class="md-nav__link">
|
||||
<a href="../../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -533,7 +531,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../templates.html" class="md-nav__link">
|
||||
<a href="../../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -594,7 +592,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-comparison.html" class="md-nav__link">
|
||||
<a href="../../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -614,7 +612,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-compatibility.html" class="md-nav__link">
|
||||
<a href="../../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -634,7 +632,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -654,7 +652,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../related-work.html" class="md-nav__link">
|
||||
<a href="../../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -717,7 +715,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="architecture.html" class="md-nav__link">
|
||||
<a href="../architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -757,7 +755,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="concurrency.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -844,7 +842,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -905,7 +903,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../contributing.html" class="md-nav__link">
|
||||
<a href="../../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -925,7 +923,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -986,7 +984,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1006,7 +1004,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1026,7 +1024,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../design/run.html" class="md-nav__link">
|
||||
<a href="../../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1046,7 +1044,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1201,7 +1199,7 @@ Git backend, <a href="https://github.com/martinvonz/jj/issues/2193">repository c
|
||||
entirely lock-free</a>. If you know
|
||||
about the bug, it is relatively easy to recover from.</p>
|
||||
<p>Moreover, such use of Jujutsu is not currently thoroughly tested,
|
||||
especially in the context of <a href="../glossary.html#co-located-repos">co-located
|
||||
especially in the context of <a href="../../glossary/#co-located-repos">co-located
|
||||
repositories</a>. While the contents of commits
|
||||
should be safe, concurrent modification of a repository from different computers
|
||||
might conceivably lose some branch pointers. Note that, unlike in pure
|
||||
@ -1297,10 +1295,10 @@ This scheme ensures that transactions are atomic.</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/technical/conflicts.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/technical/conflicts/">
|
||||
|
||||
|
||||
<link rel="prev" href="concurrency.html">
|
||||
<link rel="prev" href="../concurrency/">
|
||||
|
||||
|
||||
<link rel="next" href="../contributing.html">
|
||||
<link rel="next" href="../../contributing/">
|
||||
|
||||
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<link rel="icon" href="../../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("../..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href="../.." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../install-and-setup.html" class="md-nav__link">
|
||||
<a href="../../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../tutorial.html" class="md-nav__link">
|
||||
<a href="../../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../github.html" class="md-nav__link">
|
||||
<a href="../../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../FAQ.html" class="md-nav__link">
|
||||
<a href="../../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../working-copy.html" class="md-nav__link">
|
||||
<a href="../../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../branches.html" class="md-nav__link">
|
||||
<a href="../../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../conflicts.html" class="md-nav__link">
|
||||
<a href="../../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../operation-log.html" class="md-nav__link">
|
||||
<a href="../../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../glossary.html" class="md-nav__link">
|
||||
<a href="../../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -493,7 +491,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../config.html" class="md-nav__link">
|
||||
<a href="../../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -513,7 +511,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../revsets.html" class="md-nav__link">
|
||||
<a href="../../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -533,7 +531,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../templates.html" class="md-nav__link">
|
||||
<a href="../../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -594,7 +592,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-comparison.html" class="md-nav__link">
|
||||
<a href="../../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -614,7 +612,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../git-compatibility.html" class="md-nav__link">
|
||||
<a href="../../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -634,7 +632,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -654,7 +652,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../related-work.html" class="md-nav__link">
|
||||
<a href="../../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -717,7 +715,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="architecture.html" class="md-nav__link">
|
||||
<a href="../architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -737,7 +735,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="concurrency.html" class="md-nav__link">
|
||||
<a href="../concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -777,7 +775,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="conflicts.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -879,7 +877,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../contributing.html" class="md-nav__link">
|
||||
<a href="../../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -899,7 +897,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -960,7 +958,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -980,7 +978,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1000,7 +998,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../design/run.html" class="md-nav__link">
|
||||
<a href="../../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1020,7 +1018,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="../design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1106,7 +1104,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
|
||||
is about conflicts between changes to files (not about <a href="concurrency.html">conflicts between
|
||||
is about conflicts between changes to files (not about <a href="../concurrency/">conflicts between
|
||||
changes to branch targets</a>, for example).</p>
|
||||
<p>For example, if you merge two branches in a repo, there may be conflicting
|
||||
changes between the two branches. Most DVCSs require you to resolve those
|
||||
@ -1180,10 +1178,10 @@ which we can simplify to just <code>A</code> (i.e. no conflict).</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "../..", "features": [], "search": "../../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/templates.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/templates/">
|
||||
|
||||
|
||||
<link rel="prev" href="revsets.html">
|
||||
<link rel="prev" href="../revsets/">
|
||||
|
||||
|
||||
<link rel="next" href="git-comparison.html">
|
||||
<link rel="next" href="../git-comparison/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -352,7 +350,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -372,7 +370,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -392,7 +390,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -412,7 +410,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -432,7 +430,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -495,7 +493,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -515,7 +513,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -555,7 +553,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="templates.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -801,7 +799,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -821,7 +819,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -841,7 +839,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -861,7 +859,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -922,7 +920,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -942,7 +940,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -962,7 +960,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1023,7 +1021,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1043,7 +1041,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1104,7 +1102,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1124,7 +1122,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1144,7 +1142,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1164,7 +1162,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1596,10 +1594,10 @@ combination of the predefined keywords/functions and other aliases.</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/tutorial.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/tutorial/">
|
||||
|
||||
|
||||
<link rel="prev" href="install-and-setup.html">
|
||||
<link rel="prev" href="../install-and-setup/">
|
||||
|
||||
|
||||
<link rel="next" href="github.html">
|
||||
<link rel="next" href="../github/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -234,7 +232,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -274,7 +272,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="tutorial.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -363,7 +361,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -390,7 +388,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -443,7 +441,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="working-copy.html" class="md-nav__link">
|
||||
<a href="../working-copy/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -463,7 +461,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -483,7 +481,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -503,7 +501,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -523,7 +521,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -584,7 +582,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -604,7 +602,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -624,7 +622,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -685,7 +683,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -705,7 +703,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -725,7 +723,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -745,7 +743,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -806,7 +804,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -826,7 +824,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -846,7 +844,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -907,7 +905,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -927,7 +925,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -988,7 +986,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1008,7 +1006,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1028,7 +1026,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1048,7 +1046,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1163,7 +1161,7 @@
|
||||
<p>This text assumes that the reader is familiar with Git.</p>
|
||||
<h2 id="preparation">Preparation<a class="headerlink" href="#preparation" title="Permanent link">¶</a></h2>
|
||||
<p>If you haven't already, make sure you
|
||||
<a href="install-and-setup.html">install and configure Jujutsu</a>.</p>
|
||||
<a href="../install-and-setup/">install and configure Jujutsu</a>.</p>
|
||||
<h2 id="cloning-a-git-repo">Cloning a Git repo<a class="headerlink" href="#cloning-a-git-repo" title="Permanent link">¶</a></h2>
|
||||
<p>Let's start by cloning GitHub's Hello-World repo using <code>jj</code>:
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># Note the "git" before "clone" (there is no support for cloning native jj</span>
|
||||
@ -1270,7 +1268,7 @@ IDs because they stay the same when the commit is rewritten.</p>
|
||||
<p>By default, <code>jj log</code> lists your local commits, with some remote commits added
|
||||
for context. The <code>~</code> indicates that the commit has parents that are not
|
||||
included in the graph. We can use the <code>-r</code> flag to select a different set of
|
||||
revisions to list. The flag accepts a <a href="revsets.html">"revset"</a>, which is an
|
||||
revisions to list. The flag accepts a <a href="../revsets/">"revset"</a>, which is an
|
||||
expression in a simple language for specifying revisions. For example, <code>@</code>
|
||||
refers to the working-copy commit, <code>root()</code> refers to the root commit,
|
||||
<code>branches()</code> refers to all commits pointed to by branches. We can combine
|
||||
@ -1448,7 +1446,7 @@ try <code>jj log --at-op=367400773f87</code> but use the hash from your own <cod
|
||||
into one. There are several other commands for changing the contents of existing
|
||||
commits. These commands assume that you have <code>meld</code> installed. If you prefer a
|
||||
terminal-based diff editor, you
|
||||
can <a href="config.html#setting-up-scm-diff-editor">configure <code>scm-diff-editor</code></a> instead.</p>
|
||||
can <a href="../config/#setting-up-scm-diff-editor">configure <code>scm-diff-editor</code></a> instead.</p>
|
||||
<p>We'll need some more complex content to test these commands, so let's create a
|
||||
few more commits:
|
||||
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>master<span class="w"> </span>-m<span class="w"> </span>abc<span class="p">;</span><span class="w"> </span><span class="nb">printf</span><span class="w"> </span><span class="s1">'a\nb\nc\n'</span><span class="w"> </span>><span class="w"> </span>file
|
||||
@ -1551,10 +1549,10 @@ the instructions in the diff).</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
|
||||
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/working-copy.html">
|
||||
<link rel="canonical" href="https://martinvonz.github.io/jj/prerelease/working-copy/">
|
||||
|
||||
|
||||
<link rel="prev" href="FAQ.html">
|
||||
<link rel="prev" href="../FAQ/">
|
||||
|
||||
|
||||
<link rel="next" href="branches.html">
|
||||
<link rel="next" href="../branches/">
|
||||
|
||||
|
||||
<link rel="icon" href="assets/images/favicon.png">
|
||||
<link rel="icon" href="../assets/images/favicon.png">
|
||||
<meta name="generator" content="mkdocs-1.5.2, mkdocs-material-9.2.5">
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
<link rel="stylesheet" href="assets/stylesheets/main.0e669242.min.css">
|
||||
<link rel="stylesheet" href="../assets/stylesheets/main.0e669242.min.css">
|
||||
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://unpkg.com/iframe-worker/shim"></script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -47,7 +45,7 @@
|
||||
|
||||
|
||||
|
||||
<script>__md_scope=new URL(".",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
<script>__md_scope=new URL("..",location),__md_hash=e=>[...e].reduce((e,_)=>(e<<5)-e+_.charCodeAt(0),0),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
|
||||
|
||||
|
||||
|
||||
@ -89,7 +87,7 @@
|
||||
|
||||
<header class="md-header md-header--shadow" data-md-component="header">
|
||||
<nav class="md-header__inner md-grid" aria-label="Header">
|
||||
<a href="." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-header__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -181,7 +179,7 @@
|
||||
|
||||
<nav class="md-nav md-nav--primary" aria-label="Navigation" data-md-level="0">
|
||||
<label class="md-nav__title" for="__drawer">
|
||||
<a href="." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
<a href=".." title="Jujutsu docs" class="md-nav__button md-logo" aria-label="Jujutsu docs" data-md-component="logo">
|
||||
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54Z"/></svg>
|
||||
@ -232,7 +230,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="install-and-setup.html" class="md-nav__link">
|
||||
<a href="../install-and-setup/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -252,7 +250,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="tutorial.html" class="md-nav__link">
|
||||
<a href="../tutorial/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -272,7 +270,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="github.html" class="md-nav__link">
|
||||
<a href="../github/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -299,7 +297,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="FAQ.html" class="md-nav__link">
|
||||
<a href="../FAQ/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -374,7 +372,7 @@
|
||||
<span class="md-nav__icon md-icon"></span>
|
||||
</label>
|
||||
|
||||
<a href="working-copy.html" class="md-nav__link md-nav__link--active">
|
||||
<a href="./" class="md-nav__link md-nav__link--active">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -455,7 +453,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="branches.html" class="md-nav__link">
|
||||
<a href="../branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -475,7 +473,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="conflicts.html" class="md-nav__link">
|
||||
<a href="../conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -495,7 +493,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="operation-log.html" class="md-nav__link">
|
||||
<a href="../operation-log/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -515,7 +513,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="glossary.html" class="md-nav__link">
|
||||
<a href="../glossary/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -576,7 +574,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="config.html" class="md-nav__link">
|
||||
<a href="../config/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -596,7 +594,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="revsets.html" class="md-nav__link">
|
||||
<a href="../revsets/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -616,7 +614,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="templates.html" class="md-nav__link">
|
||||
<a href="../templates/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -677,7 +675,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-comparison.html" class="md-nav__link">
|
||||
<a href="../git-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -697,7 +695,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="git-compatibility.html" class="md-nav__link">
|
||||
<a href="../git-compatibility/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -717,7 +715,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="sapling-comparison.html" class="md-nav__link">
|
||||
<a href="../sapling-comparison/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -737,7 +735,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="related-work.html" class="md-nav__link">
|
||||
<a href="../related-work/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -798,7 +796,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/architecture.html" class="md-nav__link">
|
||||
<a href="../technical/architecture/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -818,7 +816,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/concurrency.html" class="md-nav__link">
|
||||
<a href="../technical/concurrency/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -838,7 +836,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="technical/conflicts.html" class="md-nav__link">
|
||||
<a href="../technical/conflicts/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -899,7 +897,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="contributing.html" class="md-nav__link">
|
||||
<a href="../contributing/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -919,7 +917,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="code-of-conduct.html" class="md-nav__link">
|
||||
<a href="../code-of-conduct/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -980,7 +978,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodules.html" class="md-nav__link">
|
||||
<a href="../design/git-submodules/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1000,7 +998,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/git-submodule-storage.html" class="md-nav__link">
|
||||
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1020,7 +1018,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/run.html" class="md-nav__link">
|
||||
<a href="../design/run/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1040,7 +1038,7 @@
|
||||
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="design/tracking-branches.html" class="md-nav__link">
|
||||
<a href="../design/tracking-branches/" class="md-nav__link">
|
||||
|
||||
|
||||
<span class="md-ellipsis">
|
||||
@ -1246,10 +1244,10 @@ in the working copy.</p>
|
||||
<div class="md-dialog__inner md-typeset"></div>
|
||||
</div>
|
||||
|
||||
<script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.dfff1995.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": {"provider": "mike"}}</script>
|
||||
|
||||
|
||||
<script src="assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
<script src="../assets/javascripts/bundle.78eede0e.min.js"></script>
|
||||
|
||||
|
||||
</body>
|
||||
Loading…
x
Reference in New Issue
Block a user