mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-05 23:42:50 +00:00
2060 lines
66 KiB
HTML
2060 lines
66 KiB
HTML
|
|
<!doctype html>
|
|
<html lang="en" class="no-js">
|
|
<head>
|
|
|
|
<meta charset="utf-8">
|
|
<meta name="viewport" content="width=device-width,initial-scale=1">
|
|
|
|
|
|
|
|
<link rel="canonical" href="https://jj-vcs.github.io/jj/latest/FAQ/">
|
|
|
|
|
|
<link rel="prev" href="../windows/">
|
|
|
|
|
|
<link rel="next" href="../cli-reference/">
|
|
|
|
|
|
<link rel="icon" href="../assets/images/favicon.png">
|
|
<meta name="generator" content="mkdocs-1.6.1, mkdocs-material-9.5.39">
|
|
|
|
|
|
|
|
<title>FAQ - Jujutsu docs</title>
|
|
|
|
|
|
|
|
<link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
|
|
|
|
|
|
<link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
|
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,700,700i%7CRoboto+Mono:400,400i,700,700i&display=fallback">
|
|
<style>:root{--md-text-font:"Roboto";--md-code-font:"Roboto Mono"}</style>
|
|
|
|
|
|
|
|
<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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</head>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<body dir="ltr" data-md-color-scheme="default" data-md-color-primary="indigo" data-md-color-accent="indigo">
|
|
|
|
|
|
<input class="md-toggle" data-md-toggle="drawer" type="checkbox" id="__drawer" autocomplete="off">
|
|
<input class="md-toggle" data-md-toggle="search" type="checkbox" id="__search" autocomplete="off">
|
|
<label class="md-overlay" for="__drawer"></label>
|
|
<div data-md-component="skip">
|
|
|
|
|
|
<a href="#frequently-asked-questions" class="md-skip">
|
|
Skip to content
|
|
</a>
|
|
|
|
</div>
|
|
<div data-md-component="announce">
|
|
|
|
</div>
|
|
|
|
<div data-md-color-scheme="default" data-md-component="outdated" hidden>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<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">
|
|
|
|
|
|
<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.54"/></svg>
|
|
|
|
</a>
|
|
<label class="md-header__button md-icon" for="__drawer">
|
|
|
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M3 6h18v2H3zm0 5h18v2H3zm0 5h18v2H3z"/></svg>
|
|
</label>
|
|
<div class="md-header__title" data-md-component="header-title">
|
|
<div class="md-header__ellipsis">
|
|
<div class="md-header__topic">
|
|
<span class="md-ellipsis">
|
|
Jujutsu docs
|
|
</span>
|
|
</div>
|
|
<div class="md-header__topic" data-md-component="header-topic">
|
|
<span class="md-ellipsis">
|
|
|
|
FAQ
|
|
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<form class="md-header__option" data-md-component="palette">
|
|
|
|
|
|
|
|
|
|
<input class="md-option" data-md-color-media="(prefers-color-scheme)" data-md-color-scheme="default" data-md-color-primary="indigo" data-md-color-accent="indigo" aria-label="Switch to system preference" type="radio" name="__palette" id="__palette_0">
|
|
|
|
<label class="md-header__button md-icon" title="Switch to system preference" for="__palette_1" hidden>
|
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="m14.3 16-.7-2h-3.2l-.7 2H7.8L11 7h2l3.2 9zM20 8.69V4h-4.69L12 .69 8.69 4H4v4.69L.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69L23.31 12zm-9.15 3.96h2.3L12 9z"/></svg>
|
|
</label>
|
|
|
|
|
|
|
|
|
|
|
|
<input class="md-option" data-md-color-media="(prefers-color-scheme: light)" data-md-color-scheme="default" data-md-color-primary="indigo" data-md-color-accent="indigo" aria-label="Switch to light mode" type="radio" name="__palette" id="__palette_1">
|
|
|
|
<label class="md-header__button md-icon" title="Switch to light mode" for="__palette_2" hidden>
|
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 8a4 4 0 0 0-4 4 4 4 0 0 0 4 4 4 4 0 0 0 4-4 4 4 0 0 0-4-4m0 10a6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6 6 6 0 0 1-6 6m8-9.31V4h-4.69L12 .69 8.69 4H4v4.69L.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69L23.31 12z"/></svg>
|
|
</label>
|
|
|
|
|
|
|
|
|
|
|
|
<input class="md-option" data-md-color-media="(prefers-color-scheme: dark)" data-md-color-scheme="slate" data-md-color-primary="indigo" data-md-color-accent="indigo" aria-label="Switch to dark mode" type="radio" name="__palette" id="__palette_2">
|
|
|
|
<label class="md-header__button md-icon" title="Switch to dark mode" for="__palette_0" hidden>
|
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 18c-.89 0-1.74-.2-2.5-.55C11.56 16.5 13 14.42 13 12s-1.44-4.5-3.5-5.45C10.26 6.2 11.11 6 12 6a6 6 0 0 1 6 6 6 6 0 0 1-6 6m8-9.31V4h-4.69L12 .69 8.69 4H4v4.69L.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69L23.31 12z"/></svg>
|
|
</label>
|
|
|
|
|
|
</form>
|
|
|
|
|
|
|
|
<script>var palette=__md_get("__palette");if(palette&&palette.color){if("(prefers-color-scheme)"===palette.color.media){var media=matchMedia("(prefers-color-scheme: light)"),input=document.querySelector(media.matches?"[data-md-color-media='(prefers-color-scheme: light)']":"[data-md-color-media='(prefers-color-scheme: dark)']");palette.color.media=input.getAttribute("data-md-color-media"),palette.color.scheme=input.getAttribute("data-md-color-scheme"),palette.color.primary=input.getAttribute("data-md-color-primary"),palette.color.accent=input.getAttribute("data-md-color-accent")}for(var[key,value]of Object.entries(palette.color))document.body.setAttribute("data-md-color-"+key,value)}</script>
|
|
|
|
|
|
|
|
<label class="md-header__button md-icon" for="__search">
|
|
|
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M9.5 3A6.5 6.5 0 0 1 16 9.5c0 1.61-.59 3.09-1.56 4.23l.27.27h.79l5 5-1.5 1.5-5-5v-.79l-.27-.27A6.52 6.52 0 0 1 9.5 16 6.5 6.5 0 0 1 3 9.5 6.5 6.5 0 0 1 9.5 3m0 2C7 5 5 7 5 9.5S7 14 9.5 14 14 12 14 9.5 12 5 9.5 5"/></svg>
|
|
</label>
|
|
<div class="md-search" data-md-component="search" role="dialog">
|
|
<label class="md-search__overlay" for="__search"></label>
|
|
<div class="md-search__inner" role="search">
|
|
<form class="md-search__form" name="search">
|
|
<input type="text" class="md-search__input" name="query" aria-label="Search" placeholder="Search" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" data-md-component="search-query" required>
|
|
<label class="md-search__icon md-icon" for="__search">
|
|
|
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M9.5 3A6.5 6.5 0 0 1 16 9.5c0 1.61-.59 3.09-1.56 4.23l.27.27h.79l5 5-1.5 1.5-5-5v-.79l-.27-.27A6.52 6.52 0 0 1 9.5 16 6.5 6.5 0 0 1 3 9.5 6.5 6.5 0 0 1 9.5 3m0 2C7 5 5 7 5 9.5S7 14 9.5 14 14 12 14 9.5 12 5 9.5 5"/></svg>
|
|
|
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20 11v2H8l5.5 5.5-1.42 1.42L4.16 12l7.92-7.92L13.5 5.5 8 11z"/></svg>
|
|
</label>
|
|
<nav class="md-search__options" aria-label="Search">
|
|
|
|
<button type="reset" class="md-search__icon md-icon" title="Clear" aria-label="Clear" tabindex="-1">
|
|
|
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M19 6.41 17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/></svg>
|
|
</button>
|
|
</nav>
|
|
|
|
</form>
|
|
<div class="md-search__output">
|
|
<div class="md-search__scrollwrap" tabindex="0" data-md-scrollfix>
|
|
<div class="md-search-result" data-md-component="search-result">
|
|
<div class="md-search-result__meta">
|
|
Initializing search
|
|
</div>
|
|
<ol class="md-search-result__list" role="presentation"></ol>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
</nav>
|
|
|
|
</header>
|
|
|
|
<div class="md-container" data-md-component="container">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<main class="md-main" data-md-component="main">
|
|
<div class="md-main__inner md-grid">
|
|
|
|
|
|
|
|
<div class="md-sidebar md-sidebar--primary" data-md-component="sidebar" data-md-type="navigation" >
|
|
<div class="md-sidebar__scrollwrap">
|
|
<div class="md-sidebar__inner">
|
|
|
|
|
|
|
|
|
|
<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">
|
|
|
|
|
|
<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.54"/></svg>
|
|
|
|
</a>
|
|
Jujutsu docs
|
|
</label>
|
|
|
|
<ul class="md-nav__list" data-md-scrollfix>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href=".." class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Home
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item md-nav__item--nested">
|
|
|
|
|
|
|
|
<input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2" >
|
|
|
|
|
|
<label class="md-nav__link" for="__nav_2" id="__nav_2_label" tabindex="0">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Getting started
|
|
</span>
|
|
|
|
|
|
<span class="md-nav__icon md-icon"></span>
|
|
</label>
|
|
|
|
<nav class="md-nav" data-md-level="1" aria-labelledby="__nav_2_label" aria-expanded="false">
|
|
<label class="md-nav__title" for="__nav_2">
|
|
<span class="md-nav__icon md-icon"></span>
|
|
Getting started
|
|
</label>
|
|
<ul class="md-nav__list" data-md-scrollfix>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../install-and-setup/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Installation and Setup
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../tutorial/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Tutorial and Birds-Eye View
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../github/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Working with GitHub
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../windows/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Working on Windows
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
</ul>
|
|
</nav>
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item md-nav__item--active">
|
|
|
|
<input class="md-nav__toggle md-toggle" type="checkbox" id="__toc">
|
|
|
|
|
|
|
|
|
|
|
|
<label class="md-nav__link md-nav__link--active" for="__toc">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
FAQ
|
|
</span>
|
|
|
|
|
|
<span class="md-nav__icon md-icon"></span>
|
|
</label>
|
|
|
|
<a href="./" class="md-nav__link md-nav__link--active">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
FAQ
|
|
</span>
|
|
|
|
|
|
</a>
|
|
|
|
|
|
|
|
<nav class="md-nav md-nav--secondary" aria-label="Table of contents">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<label class="md-nav__title" for="__toc">
|
|
<span class="md-nav__icon md-icon"></span>
|
|
Table of contents
|
|
</label>
|
|
<ul class="md-nav__list" data-md-component="toc" data-md-scrollfix>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#why-does-my-bookmark-not-move-to-the-new-commit-after-jj-newcommit" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Why does my bookmark not move to the new commit after jj new/commit?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#i-made-a-commit-and-jj-git-push-all-says-nothing-changed-instead-of-pushing-it-what-do-i-do" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
I made a commit and jj git push --all says "Nothing changed" instead of pushing it. What do I do?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#where-is-my-commit-why-is-it-not-visible-in-jj-log" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Where is my commit, why is it not visible in jj log?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-can-i-get-jj-log-to-show-me-what-git-log-would-show-me" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How can I get jj log to show me what git log would show me?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#can-i-monitor-how-jj-log-evolves" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Can I monitor how jj log evolves?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#should-i-co-locate-my-repository" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Should I co-locate my repository?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#jj-is-said-to-record-the-working-copy-after-jj-log-and-every-other-command-where-can-i-see-these-automatic-saves" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
jj is said to record the working copy after jj log and every other command. Where can I see these automatic "saves"?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#can-i-prevent-jujutsu-from-recording-my-unfinished-work-im-not-ready-to-commit-it" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Can I prevent Jujutsu from recording my unfinished work? I'm not ready to commit it.
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#can-i-interactively-create-a-new-commit-from-only-some-of-the-changes-in-the-working-copy-like-git-add-p-git-commit-or-hg-commit-i" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Can I interactively create a new commit from only some of the changes in the working copy, like git add -p && git commit or hg commit -i?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#is-there-something-like-git-rebase-interactive-or-hg-histedit" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Is there something like git rebase --interactive or hg histedit?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-can-i-keep-my-scratch-files-in-the-repository-without-committing-them" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How can I keep my scratch files in the repository without committing them?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-can-i-avoid-committing-my-local-only-changes-to-tracked-files" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How can I avoid committing my local-only changes to tracked files?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#i-accidentally-changed-files-in-the-wrong-commit-how-do-i-move-the-recent-changes-into-another-commit" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
I accidentally changed files in the wrong commit, how do I move the recent changes into another commit?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-do-i-resume-working-on-an-existing-change" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How do I resume working on an existing change?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#why-are-most-merge-commits-marked-as-empty" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Why are most merge commits marked as "(empty)"?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-do-i-deal-with-divergent-changes-after-the-change-id" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How do I deal with divergent changes ('??' after the change ID)?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-do-i-deal-with-conflicted-bookmarks-after-bookmark-name" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How do I deal with conflicted bookmarks ('??' after bookmark name)?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-do-i-integrate-jujutsu-with-gerrit" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How do I integrate Jujutsu with Gerrit?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#i-want-to-write-a-tool-which-integrates-with-jujutsu-should-i-use-the-library-or-parse-the-cli" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
I want to write a tool which integrates with Jujutsu. Should I use the library or parse the CLI?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
</ul>
|
|
|
|
</nav>
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../cli-reference/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
CLI Reference
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../testimonials/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Testimonials
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../community_tools/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Community-built tools
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item md-nav__item--nested">
|
|
|
|
|
|
|
|
<input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_7" >
|
|
|
|
|
|
<label class="md-nav__link" for="__nav_7" id="__nav_7_label" tabindex="0">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Concepts
|
|
</span>
|
|
|
|
|
|
<span class="md-nav__icon md-icon"></span>
|
|
</label>
|
|
|
|
<nav class="md-nav" data-md-level="1" aria-labelledby="__nav_7_label" aria-expanded="false">
|
|
<label class="md-nav__title" for="__nav_7">
|
|
<span class="md-nav__icon md-icon"></span>
|
|
Concepts
|
|
</label>
|
|
<ul class="md-nav__list" data-md-scrollfix>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../working-copy/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Working Copy
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../bookmarks/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Bookmarks
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../conflicts/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Conflicts
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../operation-log/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Operation Log
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../glossary/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Glossary
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
</ul>
|
|
</nav>
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item md-nav__item--nested">
|
|
|
|
|
|
|
|
<input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_8" >
|
|
|
|
|
|
<label class="md-nav__link" for="__nav_8" id="__nav_8_label" tabindex="0">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Configuration
|
|
</span>
|
|
|
|
|
|
<span class="md-nav__icon md-icon"></span>
|
|
</label>
|
|
|
|
<nav class="md-nav" data-md-level="1" aria-labelledby="__nav_8_label" aria-expanded="false">
|
|
<label class="md-nav__title" for="__nav_8">
|
|
<span class="md-nav__icon md-icon"></span>
|
|
Configuration
|
|
</label>
|
|
<ul class="md-nav__list" data-md-scrollfix>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../config/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Settings
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../filesets/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Fileset language
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../revsets/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Revset language
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../templates/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Templating language
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
</ul>
|
|
</nav>
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item md-nav__item--nested">
|
|
|
|
|
|
|
|
<input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_9" >
|
|
|
|
|
|
<label class="md-nav__link" for="__nav_9" id="__nav_9_label" tabindex="0">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Comparisons
|
|
</span>
|
|
|
|
|
|
<span class="md-nav__icon md-icon"></span>
|
|
</label>
|
|
|
|
<nav class="md-nav" data-md-level="1" aria-labelledby="__nav_9_label" aria-expanded="false">
|
|
<label class="md-nav__title" for="__nav_9">
|
|
<span class="md-nav__icon md-icon"></span>
|
|
Comparisons
|
|
</label>
|
|
<ul class="md-nav__list" data-md-scrollfix>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../git-comparison/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Git comparison
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../git-compatibility/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Git compatibility
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../sapling-comparison/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Sapling
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../related-work/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Other related work
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
</ul>
|
|
</nav>
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item md-nav__item--nested">
|
|
|
|
|
|
|
|
<input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_10" >
|
|
|
|
|
|
<label class="md-nav__link" for="__nav_10" id="__nav_10_label" tabindex="0">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Technical details
|
|
</span>
|
|
|
|
|
|
<span class="md-nav__icon md-icon"></span>
|
|
</label>
|
|
|
|
<nav class="md-nav" data-md-level="1" aria-labelledby="__nav_10_label" aria-expanded="false">
|
|
<label class="md-nav__title" for="__nav_10">
|
|
<span class="md-nav__icon md-icon"></span>
|
|
Technical details
|
|
</label>
|
|
<ul class="md-nav__list" data-md-scrollfix>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../technical/architecture/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Architecture
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../technical/concurrency/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Concurrency
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../technical/conflicts/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Conflicts
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
</ul>
|
|
</nav>
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item md-nav__item--nested">
|
|
|
|
|
|
|
|
<input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_11" >
|
|
|
|
|
|
<label class="md-nav__link" for="__nav_11" id="__nav_11_label" tabindex="0">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Contributing
|
|
</span>
|
|
|
|
|
|
<span class="md-nav__icon md-icon"></span>
|
|
</label>
|
|
|
|
<nav class="md-nav" data-md-level="1" aria-labelledby="__nav_11_label" aria-expanded="false">
|
|
<label class="md-nav__title" for="__nav_11">
|
|
<span class="md-nav__icon md-icon"></span>
|
|
Contributing
|
|
</label>
|
|
<ul class="md-nav__list" data-md-scrollfix>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../contributing/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Guidelines and "How to...?"
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../code-of-conduct/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Code of conduct
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../design_docs/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Design Docs
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../design_doc_blueprint/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Design Doc Blueprint
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../governance/temporary-voting/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Temporary Voting for Governance
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
</ul>
|
|
</nav>
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item md-nav__item--nested">
|
|
|
|
|
|
|
|
<input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_12" >
|
|
|
|
|
|
<label class="md-nav__link" for="__nav_12" id="__nav_12_label" tabindex="0">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Design docs
|
|
</span>
|
|
|
|
|
|
<span class="md-nav__icon md-icon"></span>
|
|
</label>
|
|
|
|
<nav class="md-nav" data-md-level="1" aria-labelledby="__nav_12_label" aria-expanded="false">
|
|
<label class="md-nav__title" for="__nav_12">
|
|
<span class="md-nav__icon md-icon"></span>
|
|
Design docs
|
|
</label>
|
|
<ul class="md-nav__list" data-md-scrollfix>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../design/git-submodules/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
git-submodules
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../design/git-submodule-storage/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
git-submodule-storage
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../design/run/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
JJ run
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../design/sparse-v2/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Sparse Patterns v2
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../design/tracking-branches/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Tracking branches
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../design/copy-tracking/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Copy tracking and tracing
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
|
|
</ul>
|
|
</nav>
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<li class="md-nav__item">
|
|
<a href="../roadmap/" class="md-nav__link">
|
|
|
|
|
|
<span class="md-ellipsis">
|
|
Development Roadmap
|
|
</span>
|
|
|
|
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
</ul>
|
|
</nav>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<div class="md-sidebar md-sidebar--secondary" data-md-component="sidebar" data-md-type="toc" >
|
|
<div class="md-sidebar__scrollwrap">
|
|
<div class="md-sidebar__inner">
|
|
|
|
|
|
<nav class="md-nav md-nav--secondary" aria-label="Table of contents">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<label class="md-nav__title" for="__toc">
|
|
<span class="md-nav__icon md-icon"></span>
|
|
Table of contents
|
|
</label>
|
|
<ul class="md-nav__list" data-md-component="toc" data-md-scrollfix>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#why-does-my-bookmark-not-move-to-the-new-commit-after-jj-newcommit" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Why does my bookmark not move to the new commit after jj new/commit?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#i-made-a-commit-and-jj-git-push-all-says-nothing-changed-instead-of-pushing-it-what-do-i-do" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
I made a commit and jj git push --all says "Nothing changed" instead of pushing it. What do I do?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#where-is-my-commit-why-is-it-not-visible-in-jj-log" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Where is my commit, why is it not visible in jj log?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-can-i-get-jj-log-to-show-me-what-git-log-would-show-me" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How can I get jj log to show me what git log would show me?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#can-i-monitor-how-jj-log-evolves" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Can I monitor how jj log evolves?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#should-i-co-locate-my-repository" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Should I co-locate my repository?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#jj-is-said-to-record-the-working-copy-after-jj-log-and-every-other-command-where-can-i-see-these-automatic-saves" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
jj is said to record the working copy after jj log and every other command. Where can I see these automatic "saves"?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#can-i-prevent-jujutsu-from-recording-my-unfinished-work-im-not-ready-to-commit-it" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Can I prevent Jujutsu from recording my unfinished work? I'm not ready to commit it.
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#can-i-interactively-create-a-new-commit-from-only-some-of-the-changes-in-the-working-copy-like-git-add-p-git-commit-or-hg-commit-i" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Can I interactively create a new commit from only some of the changes in the working copy, like git add -p && git commit or hg commit -i?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#is-there-something-like-git-rebase-interactive-or-hg-histedit" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Is there something like git rebase --interactive or hg histedit?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-can-i-keep-my-scratch-files-in-the-repository-without-committing-them" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How can I keep my scratch files in the repository without committing them?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-can-i-avoid-committing-my-local-only-changes-to-tracked-files" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How can I avoid committing my local-only changes to tracked files?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#i-accidentally-changed-files-in-the-wrong-commit-how-do-i-move-the-recent-changes-into-another-commit" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
I accidentally changed files in the wrong commit, how do I move the recent changes into another commit?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-do-i-resume-working-on-an-existing-change" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How do I resume working on an existing change?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#why-are-most-merge-commits-marked-as-empty" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
Why are most merge commits marked as "(empty)"?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-do-i-deal-with-divergent-changes-after-the-change-id" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How do I deal with divergent changes ('??' after the change ID)?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-do-i-deal-with-conflicted-bookmarks-after-bookmark-name" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How do I deal with conflicted bookmarks ('??' after bookmark name)?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#how-do-i-integrate-jujutsu-with-gerrit" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
How do I integrate Jujutsu with Gerrit?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
<li class="md-nav__item">
|
|
<a href="#i-want-to-write-a-tool-which-integrates-with-jujutsu-should-i-use-the-library-or-parse-the-cli" class="md-nav__link">
|
|
<span class="md-ellipsis">
|
|
I want to write a tool which integrates with Jujutsu. Should I use the library or parse the CLI?
|
|
</span>
|
|
</a>
|
|
|
|
</li>
|
|
|
|
</ul>
|
|
|
|
</nav>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<div class="md-content" data-md-component="content">
|
|
<article class="md-content__inner md-typeset">
|
|
|
|
|
|
|
|
|
|
<h1 id="frequently-asked-questions">Frequently asked questions<a class="headerlink" href="#frequently-asked-questions" title="Permanent link">¶</a></h1>
|
|
<h3 id="why-does-my-bookmark-not-move-to-the-new-commit-after-jj-newcommit">Why does my bookmark not move to the new commit after <code>jj new/commit</code>?<a class="headerlink" href="#why-does-my-bookmark-not-move-to-the-new-commit-after-jj-newcommit" title="Permanent link">¶</a></h3>
|
|
<p>If you're familiar with Git, you might expect the current bookmark to move forward
|
|
when you commit. However, Jujutsu does not have a concept of a "current bookmark".</p>
|
|
<p>To move bookmarks, use <code>jj bookmark move</code>.</p>
|
|
<h3 id="i-made-a-commit-and-jj-git-push-all-says-nothing-changed-instead-of-pushing-it-what-do-i-do">I made a commit and <code>jj git push --all</code> says "Nothing changed" instead of pushing it. What do I do?<a class="headerlink" href="#i-made-a-commit-and-jj-git-push-all-says-nothing-changed-instead-of-pushing-it-what-do-i-do" title="Permanent link">¶</a></h3>
|
|
<p><code>jj git push --all</code> pushes all <em>bookmarks</em>, not all revisions. You have two
|
|
options:</p>
|
|
<ul>
|
|
<li>Using <code>jj git push --change</code> will automatically create a bookmark and push it.</li>
|
|
<li>Using <code>jj bookmark</code> commands to create or move a bookmark to either the commit
|
|
you want to push or a descendant on it. Unlike Git, Jujutsu doesn't do this
|
|
automatically (see previous question).</li>
|
|
</ul>
|
|
<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/">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/">revsets</a> and <a href="../templates/">templates</a> for further guidance.</p>
|
|
<h3 id="how-can-i-get-jj-log-to-show-me-what-git-log-would-show-me">How can I get <code>jj log</code> to show me what <code>git log</code> would show me?<a class="headerlink" href="#how-can-i-get-jj-log-to-show-me-what-git-log-would-show-me" title="Permanent link">¶</a></h3>
|
|
<p>Use <code>jj log -r ..</code>. The <code>..</code> <a href="../revsets/#operators">operator</a> lists all visible commits in the repo, excluding the root (which is never interesting and is shared by all repos).</p>
|
|
<h3 id="can-i-monitor-how-jj-log-evolves">Can I monitor how <code>jj log</code> evolves?<a class="headerlink" href="#can-i-monitor-how-jj-log-evolves" title="Permanent link">¶</a></h3>
|
|
<p>The simplest way to monitor how the history as shown by <code>jj log</code> evolves is by using the <a href="https://man7.org/linux/man-pages/man1/watch.1.html">watch(1)</a> command (or <a href="https://github.com/blacknon/hwatch?tab=readme-ov-file#configuration">hwatch</a> or <a href="https://github.com/sachaos/viddy">viddy</a>).
|
|
For example:</p>
|
|
<div class="highlight"><pre><span></span><code>watch<span class="w"> </span>--color<span class="w"> </span>jj<span class="w"> </span>--ignore-working-copy<span class="w"> </span>log<span class="w"> </span>--color<span class="o">=</span>always
|
|
</code></pre></div>
|
|
<p>This will continuously update the (colored) log output in the terminal.
|
|
The <code>--ignore-working-copy</code> option avoids conflicts with manual operations during the creation of snapshots.
|
|
Martin used watch in a <a href="https://github.com/tmux/tmux/wiki">tmux</a> pane during his presentation <a href="https://www.youtube.com/watch?v=LV0JzI8IcCY">Jujutsu - A Git-compatible VCS</a>.</p>
|
|
<p>Alternatively, you can use <a href="https://github.com/tim-janik/jj-fzf">jj-fzf</a>, where the central piece is the <code>jj log</code> view and common operations can be carried out via key bindings while the log view updates.</p>
|
|
<p>The wiki lists additional TUIs and GUIs beyond the terminal: <a href="https://github.com/jj-vcs/jj/wiki/GUI-and-TUI">GUI-and-TUI</a></p>
|
|
<h3 id="should-i-co-locate-my-repository">Should I co-locate my repository?<a class="headerlink" href="#should-i-co-locate-my-repository" title="Permanent link">¶</a></h3>
|
|
<p>Co-locating a Jujutsu repository allows you to use both Jujutsu and Git in the
|
|
same working copy. The benefits of doing so are:</p>
|
|
<ul>
|
|
<li>
|
|
<p>You can use Git commands when you're not sure how to do something with
|
|
Jujutsu, Jujutsu hasn't yet implemented a feature (e.g., bisection), or you
|
|
simply prefer Git in some situations.</p>
|
|
</li>
|
|
<li>
|
|
<p>Tooling that expects a Git repository still works (IDEs, build tooling, etc.)</p>
|
|
</li>
|
|
</ul>
|
|
<p>The <a href="../git-compatibility/#co-located-jujutsugit-repos">co-location documentation describes the
|
|
drawbacks</a> but the most
|
|
important ones are:</p>
|
|
<ul>
|
|
<li>
|
|
<p>Interleaving <code>git</code> and <code>jj</code> commands may create confusing bookmark conflicts
|
|
or divergent changes.</p>
|
|
</li>
|
|
<li>
|
|
<p>If the working copy commit or its parent contain any conflicted files, tools
|
|
expecting a Git repo may interpret the commit contents or its diff in a wrong
|
|
and confusing way. You should avoid doing mutating operations with Git tools
|
|
and ignore the confusing information such tools present for conflicted commits
|
|
(unless you are curious about <a href="../technical/conflicts/">the details of how <code>jj</code> stores
|
|
conflicts</a>). See
|
|
<a href="https://github.com/jj-vcs/jj/issues/3979">#3979</a> for plans to improve
|
|
this situation.</p>
|
|
</li>
|
|
<li>
|
|
<p>Jujutsu commands may be a little slower in very large repositories due to
|
|
importing and exporting changes to Git. Most repositories are not noticeably
|
|
affected by this.</p>
|
|
</li>
|
|
</ul>
|
|
<p>If you primarily use Jujutsu to modify the repository, the drawbacks are
|
|
unlikely to affect you. Try co-locating while you learn Jujutsu, then switch if
|
|
you find a specific reason not to co-locate.</p>
|
|
<h3 id="jj-is-said-to-record-the-working-copy-after-jj-log-and-every-other-command-where-can-i-see-these-automatic-saves"><code>jj</code> is said to record the working copy after <code>jj log</code> and every other command. Where can I see these automatic "saves"?<a class="headerlink" href="#jj-is-said-to-record-the-working-copy-after-jj-log-and-every-other-command-where-can-i-see-these-automatic-saves" title="Permanent link">¶</a></h3>
|
|
<p>Indeed, every <code>jj</code> command updates the current "working-copy" revision, marked
|
|
with <code>@</code> in <code>jj log</code>. You can notice this by how the <a href="../glossary/#commit-id">commit ID</a> of the
|
|
working copy revision changes when it's updated. Note that, unless you move to
|
|
another revision (with <code>jj new</code> or <code>jj edit</code>, for example), the <a href="../glossary/#change-id">change ID</a> will
|
|
not change.</p>
|
|
<p>If you expected to see a historical view of your working copy changes in the
|
|
parent-child relationships between commits you can see in <code>jj log</code>, this is
|
|
simply not what they mean. What you can see in <code>jj log</code> is that after the
|
|
working copy commit gets amended (after any edit), the commit ID changes.</p>
|
|
<p>You can see the actual history of working copy changes using <code>jj evolog</code>. This
|
|
will show the history of the commits that were previously the "working-copy
|
|
commit", since the last time the change id of the working copy commit changed.
|
|
The obsolete changes will be marked as "hidden". They are still accessible with
|
|
any <code>jj</code> command (<code>jj diff</code>, for example), but you will need to use the commit
|
|
id to refer to hidden commits.</p>
|
|
<p>You can also use <code>jj evolog -r</code> on revisions that were previously the
|
|
working-copy revisions (or on any other revisions). Use <code>jj evolog -p</code> as an
|
|
easy way to see the evolution of the commit's contents.</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>
|
|
<p>However, you can easily record intermediate drafts of your work. If you think
|
|
you might want to go back to the current state of the working-copy commit,
|
|
simply use <code>jj new</code>. There's no need for the commit to be "finished" or even
|
|
have a description.</p>
|
|
<p>Then future edits will go into a new working-copy commit on top of the now
|
|
former working-copy commit. Whenever you are happy with another set of edits,
|
|
use <code>jj squash</code> to amend the previous commit.</p>
|
|
<p>If you have changes you <em>never</em> want to put in a public commit, see: <a href="#how-can-i-keep-my-scratch-files-in-the-repository-without-committing-them">How can I
|
|
keep my scratch files in the repository without committing
|
|
them?</a></p>
|
|
<p>For more options see the next question.</p>
|
|
<h3 id="can-i-interactively-create-a-new-commit-from-only-some-of-the-changes-in-the-working-copy-like-git-add-p-git-commit-or-hg-commit-i">Can I interactively create a new commit from only some of the changes in the working copy, like <code>git add -p && git commit</code> or <code>hg commit -i</code>?<a class="headerlink" href="#can-i-interactively-create-a-new-commit-from-only-some-of-the-changes-in-the-working-copy-like-git-add-p-git-commit-or-hg-commit-i" title="Permanent link">¶</a></h3>
|
|
<p>Since the changes are already in the working-copy commit, the equivalent to
|
|
<code>git add -p && git commit</code>/<code>git commit -p</code>/<code>hg commit -i</code> is to split the
|
|
working-copy commit with <code>jj split -i</code> (or the practically identical
|
|
<code>jj commit -i</code>).</p>
|
|
<p>For the equivalent of <code>git commit --amend -p</code>/<code>hg amend -i</code>, use <code>jj squash -i</code>.</p>
|
|
<h3 id="is-there-something-like-git-rebase-interactive-or-hg-histedit">Is there something like <code>git rebase --interactive</code> or <code>hg histedit</code>?<a class="headerlink" href="#is-there-something-like-git-rebase-interactive-or-hg-histedit" title="Permanent link">¶</a></h3>
|
|
<p>Not yet, you can check <a href="https://github.com/jj-vcs/jj/issues/1531">this issue</a> for updates.</p>
|
|
<p>To reorder commits, it is for now recommended to rebase commits individually,
|
|
which may require multiple invocations of <code>jj rebase -r</code> or <code>jj rebase -s</code>.</p>
|
|
<p>To squash or split commits, use <code>jj squash</code> and <code>jj split</code>.</p>
|
|
<h3 id="how-can-i-keep-my-scratch-files-in-the-repository-without-committing-them">How can I keep my scratch files in the repository without committing them?<a class="headerlink" href="#how-can-i-keep-my-scratch-files-in-the-repository-without-committing-them" title="Permanent link">¶</a></h3>
|
|
<p>You can set <code>snapshot.auto-track</code> to only start tracking new files matching the
|
|
configured pattern (e.g. <code>"none()"</code>). Changes to already tracked files will
|
|
still be snapshotted by every command.</p>
|
|
<p>You can keep your notes and other scratch files in the repository, if you add
|
|
a wildcard pattern to either the repo's <code>gitignore</code> or your global <code>gitignore</code>.
|
|
Something like <code>*.scratch</code> or <code>*.scratchpad</code> should do, after that rename the
|
|
files you want to keep around to match the pattern.</p>
|
|
<p>If you keep your scratch files in their own directory with no tracked files, you
|
|
can create a <code>.gitignore</code> file in that directory containing only <code>*</code>. This will
|
|
ignore everything in the directory including the <code>.gitignore</code> file itself.</p>
|
|
<p>If <code>$EDITOR</code> integration is important, something like <code>scratchpad.*</code> may be more
|
|
helpful, as you can keep the filename extension intact (it
|
|
matches <code>scratchpad.md</code>, <code>scratchpad.rs</code> and more). Another option is to add a
|
|
directory to the global <code>.gitignore</code> which then stores all your temporary files
|
|
and notes. For example, you could add <code>scratch/</code> to <code>~/.git/ignore</code> and then
|
|
store arbitrary files in <code><your-git-repo>/scratch/</code>.</p>
|
|
<p>You can find more details on <code>gitignore</code> files <a href="https://git-scm.com/docs/gitignore">here</a>.</p>
|
|
<h3 id="how-can-i-avoid-committing-my-local-only-changes-to-tracked-files">How can I avoid committing my local-only changes to tracked files?<a class="headerlink" href="#how-can-i-avoid-committing-my-local-only-changes-to-tracked-files" title="Permanent link">¶</a></h3>
|
|
<p>Suppose your repository tracks a file like <code>secret_config.json</code>, and you make
|
|
some changes to that file to work locally. Since Jujutsu automatically commits
|
|
the working copy, there's no way to prevent Jujutsu from committing changes to
|
|
the file. But, you never want to push those changes to the remote repository.</p>
|
|
<p>One solution is to keep these changes in a separate commit branched from the
|
|
trunk. To use those changes in your working copy, <em>merge</em> the private commit
|
|
into your branch.</p>
|
|
<p>Suppose you have a commit "Add new feature":</p>
|
|
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>log
|
|
@<span class="w"> </span>xxxxxxxx<span class="w"> </span>me@example.com<span class="w"> </span><span class="m">2024</span>-08-21<span class="w"> </span><span class="m">11</span>:13:21<span class="w"> </span>ef612875
|
|
│<span class="w"> </span>Add<span class="w"> </span>new<span class="w"> </span>feature
|
|
◉<span class="w"> </span>yyyyyyyy<span class="w"> </span>me@example.com<span class="w"> </span><span class="m">2024</span>-08-21<span class="w"> </span><span class="m">11</span>:13:09<span class="w"> </span>main<span class="w"> </span>b624cf12
|
|
│<span class="w"> </span>Existing<span class="w"> </span>work
|
|
~
|
|
</code></pre></div>
|
|
<p>First, create a new commit branched from main and add your private changes:</p>
|
|
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>main<span class="w"> </span>-m<span class="w"> </span><span class="s2">"private: my credentials"</span>
|
|
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>wwwwwwww<span class="w"> </span>861de9eb<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>private:<span class="w"> </span>my<span class="w"> </span>credentials
|
|
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>yyyyyyyy<span class="w"> </span>b624cf12<span class="w"> </span>main<span class="w"> </span><span class="p">|</span><span class="w"> </span>Existing<span class="w"> </span>work
|
|
Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files
|
|
|
|
$<span class="w"> </span><span class="nb">echo</span><span class="w"> </span><span class="s1">'{ "password": "p@ssw0rd1" }'</span><span class="w"> </span>><span class="w"> </span>secret_config.json
|
|
</code></pre></div>
|
|
<p>Now create a merge commit with the branch you're working on and the private
|
|
commit:</p>
|
|
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>xxxxxxxx<span class="w"> </span>wwwwwwww
|
|
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>vvvvvvvv<span class="w"> </span>ac4d9fbe<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
|
|
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>xxxxxxxx<span class="w"> </span>ef612875<span class="w"> </span>Add<span class="w"> </span>new<span class="w"> </span>feature
|
|
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>wwwwwwww<span class="w"> </span>2106921e<span class="w"> </span>private:<span class="w"> </span>my<span class="w"> </span>credentials
|
|
Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files
|
|
|
|
$<span class="w"> </span>jj<span class="w"> </span>log
|
|
@<span class="w"> </span>vvvvvvvv<span class="w"> </span>me@example.com<span class="w"> </span><span class="m">2024</span>-08-22<span class="w"> </span><span class="m">08</span>:57:40<span class="w"> </span>ac4d9fbe
|
|
├─╮<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
|
|
│<span class="w"> </span>◉<span class="w"> </span>wwwwwwww<span class="w"> </span>me@example.com<span class="w"> </span><span class="m">2024</span>-08-22<span class="w"> </span><span class="m">08</span>:57:40<span class="w"> </span>2106921e
|
|
│<span class="w"> </span>│<span class="w"> </span>private:<span class="w"> </span>my<span class="w"> </span>credentials
|
|
◉<span class="w"> </span>│<span class="w"> </span>xxxxxxxx<span class="w"> </span>me@example.com<span class="w"> </span><span class="m">2024</span>-08-21<span class="w"> </span><span class="m">11</span>:13:21<span class="w"> </span>ef612875
|
|
├─╯<span class="w"> </span>Add<span class="w"> </span>new<span class="w"> </span>feature
|
|
◉<span class="w"> </span>yyyyyyyy<span class="w"> </span>me@example.com<span class="w"> </span><span class="m">2024</span>-08-21<span class="w"> </span><span class="m">11</span>:13:09<span class="w"> </span>main<span class="w"> </span>b624cf12
|
|
│<span class="w"> </span>Existing<span class="w"> </span>work
|
|
~
|
|
</code></pre></div>
|
|
<p>Now you're ready to work:</p>
|
|
<ul>
|
|
<li>Your work in progress <em>xxxxxxxx</em> is the first parent of the merge commit.</li>
|
|
<li>The private commit <em>wwwwwwww</em> is the second parent of the merge commit.</li>
|
|
<li>The working copy (<em>vvvvvvvv</em>) contains changes from both.</li>
|
|
</ul>
|
|
<p>As you work, squash your changes using <code>jj squash --into xxxxxxxx</code>.</p>
|
|
<p>If you need a new empty commit on top of <code>xxxxxxxx</code> you can use the
|
|
<code>--insert-after</code> and <code>--insert-before</code> options (<code>-A</code> and <code>-B</code> for short):</p>
|
|
<div class="highlight"><pre><span></span><code><span class="c1"># Insert a new commit after xxxxxxxx</span>
|
|
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>--no-edit<span class="w"> </span>-A<span class="w"> </span>xxxxxxxx<span class="w"> </span>-m<span class="w"> </span><span class="s2">"Another feature"</span>
|
|
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>uuuuuuuu<span class="w"> </span>1c3cff09<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Another<span class="w"> </span>feature
|
|
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>xxxxxxxx<span class="w"> </span>ef612875<span class="w"> </span>Add<span class="w"> </span>new<span class="w"> </span>feature
|
|
|
|
<span class="c1"># Insert a new commit between yyyyyyyy and vvvvvvvv</span>
|
|
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>--no-edit<span class="w"> </span>-A<span class="w"> </span>yyyyyyyy<span class="w"> </span>-B<span class="w"> </span>vvvvvvvv<span class="w"> </span>-m<span class="w"> </span><span class="s2">"Yet another feature"</span>
|
|
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>tttttttt<span class="w"> </span>938ab831<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Yet<span class="w"> </span>another<span class="w"> </span>feature
|
|
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>yyyyyyyy<span class="w"> </span>b624cf12<span class="w"> </span>Existing<span class="w"> </span>work
|
|
</code></pre></div>
|
|
<p>To avoid pushing change <em>wwwwwwww</em> by mistake, use the configuration
|
|
<a href="../config/#set-of-private-commits">git.private-commits</a>:</p>
|
|
<div class="highlight"><pre><span></span><code>$ jj config set --user git.private-commits 'description(glob:"private:*")'
|
|
</code></pre></div>
|
|
<h3 id="i-accidentally-changed-files-in-the-wrong-commit-how-do-i-move-the-recent-changes-into-another-commit">I accidentally changed files in the wrong commit, how do I move the recent changes into another commit?<a class="headerlink" href="#i-accidentally-changed-files-in-the-wrong-commit-how-do-i-move-the-recent-changes-into-another-commit" title="Permanent link">¶</a></h3>
|
|
<p>Use <code>jj evolog -p</code> to see how your working-copy commit has evolved. Find the
|
|
commit you want to restore the contents to. Let's say the current commit (with
|
|
the changes intended for a new commit) are in commit X and the state you wanted
|
|
is in commit Y. Note the commit id (normally in blue at the end of the line in
|
|
the log output) of each of them. Now use <code>jj new</code> to create a new working-copy
|
|
commit, then run <code>jj restore --from Y --to @-</code> to restore the parent commit
|
|
to the old state, and <code>jj restore --from X</code> to restore the new working-copy
|
|
commit to the new state.</p>
|
|
<h3 id="how-do-i-resume-working-on-an-existing-change">How do I resume working on an existing change?<a class="headerlink" href="#how-do-i-resume-working-on-an-existing-change" title="Permanent link">¶</a></h3>
|
|
<p>There are two ways to resume working on an earlier change: <code>jj new</code> then <code>jj squash</code>,
|
|
and <code>jj edit</code>. The first is generally recommended, but <code>jj edit</code> can be useful. When
|
|
you use <code>jj edit</code>, the revision is directly amended with your new changes, making it
|
|
difficult to tell what exactly you change. You should avoid using <code>jj edit</code> when the
|
|
revision has a conflict, as you may accidentally break the plain-text annotations on
|
|
your state without realising.</p>
|
|
<p>To start, use <code>jj new <rev></code> to create a change based on that earlier revision. Make
|
|
your edits, then use <code>jj squash</code> to update the earlier revision with those edits.
|
|
For when you would use git stashing, use <code>jj edit <rev></code> for expected behaviour.
|
|
Other workflows may prefer <code>jj edit</code> as well.</p>
|
|
<h3 id="why-are-most-merge-commits-marked-as-empty">Why are most merge commits marked as "(empty)"?<a class="headerlink" href="#why-are-most-merge-commits-marked-as-empty" title="Permanent link">¶</a></h3>
|
|
<p>Jujutsu, like Git, is a snapshot-based VCS. That means that each commit
|
|
logically records the state of all current files in the repo. The changes in a
|
|
commit are not recorded but are instead calculated when needed by comparing the
|
|
commit's state to the parent commit's state. Jujutsu defines the changes in a
|
|
commit to be relative to the auto-merged parents (if there's only one parent,
|
|
then that merge is trivial - it's the parent commit's state). As a result, a
|
|
merge commit that was a clean merge (no conflict resolution, no additional
|
|
changes) is considered empty. Conversely, if the merge commit contains conflict
|
|
resolutions or additional changes, then it will be considered non-empty.</p>
|
|
<p>This definition of the changes in a commit is used throughout Jujutsu. It's
|
|
used by <code>jj diff -r</code> and <code>jj log -p</code> to show the changes in a commit. It's used
|
|
by <code>jj rebase</code> to rebase the changes in a commit. It's used in <code>jj log</code> to
|
|
indicate which commits are empty. It's used in the <code>files()</code> revset function
|
|
(and by <code>jj log <path></code>) to find commits that modify a certain path. And so on.</p>
|
|
<h3 id="how-do-i-deal-with-divergent-changes-after-the-change-id">How do I deal with divergent changes ('??' after the <a href="../glossary/#change-id">change ID</a>)?<a class="headerlink" href="#how-do-i-deal-with-divergent-changes-after-the-change-id" title="Permanent link">¶</a></h3>
|
|
<p>A <a href="../glossary/#divergent-change">divergent change</a> represents a change that has two
|
|
or more visible commits associated with it. To refer to such commits, you must
|
|
use their <a href="../glossary/#commit-id">commit ID</a>. Most commonly, the way to resolve
|
|
this is to abandon the unneeded commits (using <code>jj abandon <commit ID></code>). If you
|
|
would like to keep both commits with this change ID, you can <code>jj duplicate</code> one
|
|
of them before abandoning it.</p>
|
|
<h3 id="how-do-i-deal-with-conflicted-bookmarks-after-bookmark-name">How do I deal with conflicted bookmarks ('??' after bookmark name)?<a class="headerlink" href="#how-do-i-deal-with-conflicted-bookmarks-after-bookmark-name" title="Permanent link">¶</a></h3>
|
|
<p>A <a href="../bookmarks/#conflicts">conflicted bookmark</a> is a bookmark that refers to multiple
|
|
different commits because jj couldn't fully resolve its desired position.
|
|
Resolving conflicted bookmarks is usually done by setting the bookmark to the
|
|
correct commit using <code>jj bookmark move <name> --to <commit ID></code>.</p>
|
|
<p>Usually, the different commits associated with the conflicted bookmark should all
|
|
appear in the log, but if they don't you can use <code>jj bookmark list</code>to show all the
|
|
commits associated with it.</p>
|
|
<h3 id="how-do-i-integrate-jujutsu-with-gerrit">How do I integrate Jujutsu with Gerrit?<a class="headerlink" href="#how-do-i-integrate-jujutsu-with-gerrit" title="Permanent link">¶</a></h3>
|
|
<p>At the moment you'll need a script, which adds the required fields for Gerrit
|
|
like the <code>Change-Id</code> footer. Then <code>jj</code> can invoke it via an <code>$EDITOR</code> override
|
|
in an aliased command. Here's an <a href="https://gist.github.com/thoughtpolice/8f2fd36ae17cd11b8e7bd93a70e31ad6">example</a> from an
|
|
contributor (look for the <code>jj signoff</code> alias).</p>
|
|
<p>After you have attached the <code>Change-Id:</code> footer to the commit series, you'll
|
|
have to manually invoke <code>git push</code> of <code>HEAD</code> on the underlying git repository
|
|
into the remote Gerrit bookmark <code>refs/for/$BRANCH</code>, where <code>$BRANCH</code> is the base
|
|
bookmark you want your changes to go to (e.g., <code>git push origin
|
|
HEAD:refs/for/main</code>). Using a <a href="../glossary/#co-located-repos">co-located</a> repo
|
|
will make the underlying git repo directly accessible from the working
|
|
directory.</p>
|
|
<p>We hope to integrate with Gerrit natively in the future.</p>
|
|
<h3 id="i-want-to-write-a-tool-which-integrates-with-jujutsu-should-i-use-the-library-or-parse-the-cli">I want to write a tool which integrates with Jujutsu. Should I use the library or parse the CLI?<a class="headerlink" href="#i-want-to-write-a-tool-which-integrates-with-jujutsu-should-i-use-the-library-or-parse-the-cli" title="Permanent link">¶</a></h3>
|
|
<p>There are some trade-offs and there is no definitive answer yet.</p>
|
|
<ul>
|
|
<li>Using <code>jj-lib</code> avoids parsing command output and makes error handling easier.</li>
|
|
<li><code>jj-lib</code> is not a stable API, so you may have to make changes to your tool
|
|
when the API changes.</li>
|
|
<li>The CLI is not stable either, so you may need to make your tool detect the
|
|
different versions and call the right command.</li>
|
|
<li>Using the CLI means that your tool will work with custom-built <code>jj</code> binaries,
|
|
like the one at Google (if you're using the library, you will not be able to
|
|
detect custom backends and more).</li>
|
|
</ul>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</article>
|
|
</div>
|
|
|
|
|
|
<script>var target=document.getElementById(location.hash.slice(1));target&&target.name&&(target.checked=target.name.startsWith("__tabbed_"))</script>
|
|
</div>
|
|
|
|
</main>
|
|
|
|
<footer class="md-footer">
|
|
|
|
<div class="md-footer-meta md-typeset">
|
|
<div class="md-footer-meta__inner md-grid">
|
|
<div class="md-copyright">
|
|
|
|
|
|
Made with
|
|
<a href="https://squidfunk.github.io/mkdocs-material/" target="_blank" rel="noopener">
|
|
Material for MkDocs
|
|
</a>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
</div>
|
|
</footer>
|
|
|
|
</div>
|
|
<div class="md-dialog" data-md-component="dialog">
|
|
<div class="md-dialog__inner md-typeset"></div>
|
|
</div>
|
|
|
|
|
|
<script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": {"alias": true, "provider": "mike"}}</script>
|
|
|
|
|
|
<script src="../assets/javascripts/bundle.525ec568.min.js"></script>
|
|
|
|
|
|
</body>
|
|
</html> |