2023-08-26 04:56:32 +00:00
<!doctype html>
< html lang = "en" class = "no-js" >
< head >
< meta charset = "utf-8" >
< meta name = "viewport" content = "width=device-width,initial-scale=1" >
2023-10-03 03:41:01 +00:00
< link rel = "canonical" href = "https://martinvonz.github.io/jj/prerelease/FAQ/" >
2023-08-26 04:56:32 +00:00
2024-01-29 20:16:49 +00:00
< link rel = "prev" href = "../windows/" >
2023-08-26 04:56:32 +00:00
2024-01-30 22:59:03 +00:00
< link rel = "next" href = "../cli-reference/" >
2023-08-26 04:56:32 +00:00
2023-10-03 03:41:01 +00:00
< link rel = "icon" href = "../assets/images/favicon.png" >
2024-01-07 20:46:19 +00:00
< meta name = "generator" content = "mkdocs-1.5.3, mkdocs-material-9.5.3" >
2023-08-26 04:56:32 +00:00
< title > FAQ - Jujutsu docs< / title >
2024-01-07 20:46:19 +00:00
< link rel = "stylesheet" href = "../assets/stylesheets/main.50c56a3b.min.css" >
2023-08-26 04:56:32 +00:00
2024-01-07 21:07:59 +00:00
< link rel = "stylesheet" href = "../assets/stylesheets/palette.06af60db.min.css" >
2023-08-26 04:56:32 +00:00
< 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 >
2023-10-03 03:41:01 +00:00
< 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 >
2023-08-26 04:56:32 +00:00
< / head >
2024-01-07 21:07:59 +00:00
< body dir = "ltr" data-md-color-scheme = "default" data-md-color-primary = "indigo" data-md-color-accent = "indigo" >
2023-08-26 04:56:32 +00:00
< 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" >
2023-10-03 03:41:01 +00:00
< a href = ".." title = "Jujutsu docs" class = "md-header__button md-logo" aria-label = "Jujutsu docs" data-md-component = "logo" >
2023-08-26 04:56:32 +00:00
< 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 >
< / 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 6h18v2H3V6m0 5h18v2H3v-2m0 5h18v2H3v-2Z" / > < / 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 >
2024-01-07 21:07:59 +00:00
< 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 9h-1.9M20 8.69V4h-4.69L12 .69 8.69 4H4v4.69L.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69L23.31 12 20 8.69m-9.15 3.96h2.3L12 9l-1.15 3.65Z" / > < / 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 12 20 8.69Z" / > < / 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 12c0-2.42-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 12 20 8.69Z" / > < / svg >
< / label >
< / form >
2023-08-26 04:56:32 +00:00
2024-01-07 20:46:19 +00:00
< script > var media , input , key , value , palette = _ _md _get ( "__palette" ) ; if ( palette && palette . color ) { "(prefers-color-scheme)" === palette . color . media && ( 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 ( [ key , value ] of Object . entries ( palette . color ) ) document . body . setAttribute ( "data-md-color-" + key , value ) } < / script >
2023-08-26 04:56:32 +00:00
2023-08-28 17:58:36 +00:00
< 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.516 6.516 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 5Z" / > < / 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.516 6.516 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 5Z" / > < / 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 11h12Z" / > < / 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 12 19 6.41Z" / > < / svg >
< / button >
< / nav >
< / form >
< div class = "md-search__output" >
< div class = "md-search__scrollwrap" 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 >
2023-08-26 04:56:32 +00:00
< / 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" >
2023-10-03 03:41:01 +00:00
< a href = ".." title = "Jujutsu docs" class = "md-nav__button md-logo" aria-label = "Jujutsu docs" data-md-component = "logo" >
2023-08-26 04:56:32 +00:00
< 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 >
< / a >
Jujutsu docs
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
2024-01-07 20:46:19 +00:00
2023-10-04 02:59:08 +00:00
< li class = "md-nav__item" >
< a href = ".." class = "md-nav__link" >
< span class = "md-ellipsis" >
Home
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item md-nav__item--nested" >
2023-10-04 02:59:08 +00:00
< input class = "md-nav__toggle md-toggle " type = "checkbox" id = "__nav_2" >
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2023-10-04 02:59:08 +00:00
< label class = "md-nav__link" for = "__nav_2" id = "__nav_2_label" tabindex = "0" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Getting started
< / span >
< span class = "md-nav__icon md-icon" > < / span >
< / label >
2023-10-04 02:59:08 +00:00
< nav class = "md-nav" data-md-level = "1" aria-labelledby = "__nav_2_label" aria-expanded = "false" >
< label class = "md-nav__title" for = "__nav_2" >
2023-08-26 04:56:32 +00:00
< span class = "md-nav__icon md-icon" > < / span >
Getting started
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../install-and-setup/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Installation and Setup
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../tutorial/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Tutorial and Birds-Eye View
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../github/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
2023-08-28 17:58:36 +00:00
Working with GitHub
2023-08-26 04:56:32 +00:00
< / span >
< / a >
< / li >
2024-01-29 20:16:49 +00:00
< li class = "md-nav__item" >
< a href = "../windows/" class = "md-nav__link" >
< span class = "md-ellipsis" >
Working on Windows
< / span >
< / a >
< / li >
2023-08-26 04:56:32 +00:00
< / ul >
< / nav >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< 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 >
2023-10-03 03:41:01 +00:00
< a href = "./" class = "md-nav__link md-nav__link--active" >
2023-08-26 04:56:32 +00:00
< 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-branch-not-move-to-the-new-commit-after-jj-newcommit" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
Why does my branch not move to the new commit after jj new/commit?
< / span >
2023-08-26 04:56:32 +00:00
< / 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" >
2024-01-07 20:46:19 +00:00
< 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 >
2023-08-26 04:56:32 +00:00
< / 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" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
Where is my commit, why is it not visible in jj log?
< / span >
2023-08-26 04:56:32 +00:00
< / a >
2023-11-02 19:29:53 +00:00
< / li >
< li class = "md-nav__item" >
< a href = "#jj-is-said-to-record-the-working-after-jj-log-and-every-other-command-where-can-i-see-these-automatic-saves" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
jj is said to record the working after jj log and every other command. Where can I see these automatic "saves"?
< / span >
2023-11-02 19:29:53 +00:00
< / a >
2023-08-26 04:56:32 +00:00
< / 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" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
Can I prevent Jujutsu from recording my unfinished work? I'm not ready to commit it.
< / span >
2023-08-26 04:56:32 +00:00
< / a >
< / li >
< li class = "md-nav__item" >
2023-10-22 22:38:21 +00:00
< 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" >
2024-01-07 20:46:19 +00:00
< 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 >
2023-08-26 04:56:32 +00:00
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#is-there-something-like-git-rebase-interactive-or-hg-histedit" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
Is there something like git rebase --interactive or hg histedit?
< / span >
2023-08-26 04:56:32 +00:00
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#how-can-i-keep-my-scratch-files-in-the-repository" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
How can I keep my scratch files in the repository?
< / span >
2023-08-26 04:56:32 +00:00
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#how-can-i-keep-local-changes-around-but-not-use-them-for-pull-requests" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
How can I keep local changes around, but not use them for Pull Requests?
< / span >
2023-08-26 04:56:32 +00:00
< / a >
2023-09-08 16:00:43 +00:00
< / li >
< li class = "md-nav__item" >
2024-01-29 19:42:58 +00:00
< a href = "#i-accidentally-changed-files-in-the-wrong-commit-how-do-i-move-the-recent-changes-into-another-commit" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
2024-01-29 19:42:58 +00:00
I accidentally changed files in the wrong commit, how do I move the recent changes into another commit?
2024-01-07 20:46:19 +00:00
< / span >
2023-09-08 16:00:43 +00:00
< / a >
2023-11-01 07:56:36 +00:00
< / li >
< li class = "md-nav__item" >
< a href = "#how-do-i-deal-with-divergent-changes-after-the-change-id" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
How do I deal with divergent changes ('??' after the change ID)?
< / span >
2023-11-01 07:56:36 +00:00
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#how-do-i-deal-with-conflicted-branches-after-branch-name" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
How do I deal with conflicted branches ('??' after branch name)?
< / span >
2023-11-01 07:56:36 +00:00
< / a >
2024-01-01 20:08:58 +00:00
< / li >
< li class = "md-nav__item" >
< a href = "#how-do-i-integrate-jujutsu-with-gerrit" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
How do I integrate Jujutsu with Gerrit?
< / span >
2024-01-01 20:08:58 +00:00
< / a >
2023-08-26 04:56:32 +00:00
< / li >
< / ul >
< / nav >
< / li >
2024-01-07 20:46:19 +00:00
2024-01-30 22:59:03 +00:00
< li class = "md-nav__item" >
< a href = "../cli-reference/" class = "md-nav__link" >
< span class = "md-ellipsis" >
CLI Reference
< / span >
< / a >
< / li >
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item md-nav__item--nested" >
2024-01-30 22:59:03 +00:00
< input class = "md-nav__toggle md-toggle " type = "checkbox" id = "__nav_5" >
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2024-01-30 22:59:03 +00:00
< label class = "md-nav__link" for = "__nav_5" id = "__nav_5_label" tabindex = "0" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Concepts
< / span >
< span class = "md-nav__icon md-icon" > < / span >
< / label >
2024-01-30 22:59:03 +00:00
< nav class = "md-nav" data-md-level = "1" aria-labelledby = "__nav_5_label" aria-expanded = "false" >
< label class = "md-nav__title" for = "__nav_5" >
2023-08-26 04:56:32 +00:00
< span class = "md-nav__icon md-icon" > < / span >
Concepts
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../working-copy/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Working Copy
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../branches/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Branches
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../conflicts/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Conflicts
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../operation-log/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Operation Log
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../glossary/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Glossary
< / span >
< / a >
< / li >
< / ul >
< / nav >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item md-nav__item--nested" >
2024-01-30 22:59:03 +00:00
< input class = "md-nav__toggle md-toggle " type = "checkbox" id = "__nav_6" >
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2024-01-30 22:59:03 +00:00
< label class = "md-nav__link" for = "__nav_6" id = "__nav_6_label" tabindex = "0" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Configuration
< / span >
< span class = "md-nav__icon md-icon" > < / span >
< / label >
2024-01-30 22:59:03 +00:00
< nav class = "md-nav" data-md-level = "1" aria-labelledby = "__nav_6_label" aria-expanded = "false" >
< label class = "md-nav__title" for = "__nav_6" >
2023-08-26 04:56:32 +00:00
< span class = "md-nav__icon md-icon" > < / span >
Configuration
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../config/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Settings
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../revsets/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Revset language
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../templates/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Templating language
< / span >
< / a >
< / li >
< / ul >
< / nav >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item md-nav__item--nested" >
2024-01-30 22:59:03 +00:00
< input class = "md-nav__toggle md-toggle " type = "checkbox" id = "__nav_7" >
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2024-01-30 22:59:03 +00:00
< label class = "md-nav__link" for = "__nav_7" id = "__nav_7_label" tabindex = "0" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Comparisons
< / span >
< span class = "md-nav__icon md-icon" > < / span >
< / label >
2024-01-30 22:59:03 +00:00
< nav class = "md-nav" data-md-level = "1" aria-labelledby = "__nav_7_label" aria-expanded = "false" >
< label class = "md-nav__title" for = "__nav_7" >
2023-08-26 04:56:32 +00:00
< span class = "md-nav__icon md-icon" > < / span >
Comparisons
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../git-comparison/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Git comparison
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../git-compatibility/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Git compatibility
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../sapling-comparison/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Sapling
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../related-work/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Other related work
< / span >
< / a >
< / li >
< / ul >
< / nav >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item md-nav__item--nested" >
2024-01-30 22:59:03 +00:00
< input class = "md-nav__toggle md-toggle " type = "checkbox" id = "__nav_8" >
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2024-01-30 22:59:03 +00:00
< label class = "md-nav__link" for = "__nav_8" id = "__nav_8_label" tabindex = "0" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Technical details
< / span >
< span class = "md-nav__icon md-icon" > < / span >
< / label >
2024-01-30 22:59:03 +00:00
< nav class = "md-nav" data-md-level = "1" aria-labelledby = "__nav_8_label" aria-expanded = "false" >
< label class = "md-nav__title" for = "__nav_8" >
2023-08-26 04:56:32 +00:00
< span class = "md-nav__icon md-icon" > < / span >
Technical details
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../technical/architecture/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Architecture
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../technical/concurrency/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Concurrency
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../technical/conflicts/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Conflicts
< / span >
< / a >
< / li >
< / ul >
< / nav >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item md-nav__item--nested" >
2024-01-30 22:59:03 +00:00
< input class = "md-nav__toggle md-toggle " type = "checkbox" id = "__nav_9" >
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2024-01-30 22:59:03 +00:00
< label class = "md-nav__link" for = "__nav_9" id = "__nav_9_label" tabindex = "0" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Contributing
< / span >
< span class = "md-nav__icon md-icon" > < / span >
< / label >
2024-01-30 22:59:03 +00:00
< nav class = "md-nav" data-md-level = "1" aria-labelledby = "__nav_9_label" aria-expanded = "false" >
< label class = "md-nav__title" for = "__nav_9" >
2023-08-26 04:56:32 +00:00
< span class = "md-nav__icon md-icon" > < / span >
Contributing
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../contributing/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
2023-08-28 17:58:36 +00:00
Guidelines and "How to...?"
2023-08-26 04:56:32 +00:00
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../code-of-conduct/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Code of conduct
< / span >
< / a >
< / li >
< / ul >
< / nav >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item md-nav__item--nested" >
2024-01-30 22:59:03 +00:00
< input class = "md-nav__toggle md-toggle " type = "checkbox" id = "__nav_10" >
2023-08-26 04:56:32 +00:00
2023-11-04 02:16:06 +00:00
2024-01-30 22:59:03 +00:00
< label class = "md-nav__link" for = "__nav_10" id = "__nav_10_label" tabindex = "0" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Design docs
< / span >
< span class = "md-nav__icon md-icon" > < / span >
< / label >
2024-01-30 22:59:03 +00:00
< nav class = "md-nav" data-md-level = "1" aria-labelledby = "__nav_10_label" aria-expanded = "false" >
< label class = "md-nav__title" for = "__nav_10" >
2023-08-26 04:56:32 +00:00
< span class = "md-nav__icon md-icon" > < / span >
Design docs
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../design/git-submodules/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
git-submodules
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../design/git-submodule-storage/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
git-submodule-storage
< / span >
< / a >
< / li >
2024-01-07 20:46:19 +00:00
2023-09-14 14:40:17 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../design/run/" class = "md-nav__link" >
2023-09-14 14:40:17 +00:00
< span class = "md-ellipsis" >
JJ run
< / span >
< / a >
< / li >
2024-02-02 00:02:46 +00:00
< li class = "md-nav__item" >
< a href = "../design/sparse-v2/" class = "md-nav__link" >
< span class = "md-ellipsis" >
Sparse Patterns v2
< / span >
< / a >
< / li >
2023-09-14 14:40:17 +00:00
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< li class = "md-nav__item" >
2023-10-03 03:41:01 +00:00
< a href = "../design/tracking-branches/" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Tracking branches
< / span >
< / a >
< / li >
< / ul >
< / nav >
< / 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-branch-not-move-to-the-new-commit-after-jj-newcommit" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
Why does my branch not move to the new commit after jj new/commit?
< / span >
2023-08-26 04:56:32 +00:00
< / 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" >
2024-01-07 20:46:19 +00:00
< 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 >
2023-08-26 04:56:32 +00:00
< / 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" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
Where is my commit, why is it not visible in jj log?
< / span >
2023-08-26 04:56:32 +00:00
< / a >
2023-11-02 19:29:53 +00:00
< / li >
< li class = "md-nav__item" >
< a href = "#jj-is-said-to-record-the-working-after-jj-log-and-every-other-command-where-can-i-see-these-automatic-saves" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
jj is said to record the working after jj log and every other command. Where can I see these automatic "saves"?
< / span >
2023-11-02 19:29:53 +00:00
< / a >
2023-08-26 04:56:32 +00:00
< / 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" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
Can I prevent Jujutsu from recording my unfinished work? I'm not ready to commit it.
< / span >
2023-08-26 04:56:32 +00:00
< / a >
< / li >
< li class = "md-nav__item" >
2023-10-22 22:38:21 +00:00
< 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" >
2024-01-07 20:46:19 +00:00
< 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 >
2023-08-26 04:56:32 +00:00
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#is-there-something-like-git-rebase-interactive-or-hg-histedit" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
Is there something like git rebase --interactive or hg histedit?
< / span >
2023-08-26 04:56:32 +00:00
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#how-can-i-keep-my-scratch-files-in-the-repository" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
How can I keep my scratch files in the repository?
< / span >
2023-08-26 04:56:32 +00:00
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#how-can-i-keep-local-changes-around-but-not-use-them-for-pull-requests" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
How can I keep local changes around, but not use them for Pull Requests?
< / span >
2023-08-26 04:56:32 +00:00
< / a >
2023-09-08 16:00:43 +00:00
< / li >
< li class = "md-nav__item" >
2024-01-29 19:42:58 +00:00
< a href = "#i-accidentally-changed-files-in-the-wrong-commit-how-do-i-move-the-recent-changes-into-another-commit" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
2024-01-29 19:42:58 +00:00
I accidentally changed files in the wrong commit, how do I move the recent changes into another commit?
2024-01-07 20:46:19 +00:00
< / span >
2023-09-08 16:00:43 +00:00
< / a >
2023-11-01 07:56:36 +00:00
< / li >
< li class = "md-nav__item" >
< a href = "#how-do-i-deal-with-divergent-changes-after-the-change-id" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
How do I deal with divergent changes ('??' after the change ID)?
< / span >
2023-11-01 07:56:36 +00:00
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#how-do-i-deal-with-conflicted-branches-after-branch-name" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
How do I deal with conflicted branches ('??' after branch name)?
< / span >
2023-11-01 07:56:36 +00:00
< / a >
2024-01-01 20:08:58 +00:00
< / li >
< li class = "md-nav__item" >
< a href = "#how-do-i-integrate-jujutsu-with-gerrit" class = "md-nav__link" >
2024-01-07 20:46:19 +00:00
< span class = "md-ellipsis" >
How do I integrate Jujutsu with Gerrit?
< / span >
2024-01-01 20:08:58 +00:00
< / a >
2023-08-26 04:56:32 +00:00
< / li >
< / ul >
< / nav >
< / div >
< / div >
< / div >
< div class = "md-content" data-md-component = "content" >
< article class = "md-content__inner md-typeset" >
2023-08-28 17:58:36 +00:00
< 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-branch-not-move-to-the-new-commit-after-jj-newcommit" > Why does my branch not move to the new commit after < code > jj new/commit< / code > ?< a class = "headerlink" href = "#why-does-my-branch-not-move-to-the-new-commit-after-jj-newcommit" title = "Permanent link" > ¶ < / a > < / h3 >
2023-08-26 04:56:32 +00:00
< p > If you're familiar with Git, you might expect the current branch to move forward
when you commit. However, Jujutsu does not have a concept of a "current branch".< / p >
< p > To move branches, use < code > jj branch set< / code > .< / p >
2023-08-28 17:58:36 +00:00
< 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 >
2023-08-26 04:56:32 +00:00
< p > < code > jj git push --all< / code > pushes all < em > branches< / em > , not all revisions. You have two
options:< / p >
< ul >
< li > Using < code > jj git push --change< / code > will automatically create a branch and push it.< / li >
< li > Using < code > jj branch< / code > commands to create or move a branch 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 >
2023-08-28 17:58:36 +00:00
< 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 >
2023-08-26 04:56:32 +00:00
< 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
2023-10-03 03:41:01 +00:00
< code > revsets.log< / code > by default. You can change it as described in < a href = "../config/" > config< / a > to show
2023-08-26 04:56:32 +00:00
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 >
2023-10-03 03:41:01 +00:00
< p > See < a href = "../revsets/" > revsets< / a > and < a href = "../templates/" > templates< / a > for further guidance.< / p >
2023-11-02 19:29:53 +00:00
< h3 id = "jj-is-said-to-record-the-working-after-jj-log-and-every-other-command-where-can-i-see-these-automatic-saves" > < code > jj< / code > is said to record the working 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-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
< code > jj log< / code > , as a chain in a parent-child relationship, this is not the case.
Instead, each commit gets amended and the commit ID changes.< / p >
< p > You can see the history of these changes using < code > jj obslog< / 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 obslog -r< / code > on revisions that were previously the
working-copy revisions. Use < code > jj obslog -p< / code > as an easy way to see a commit's
evolution.< / p >
2023-08-28 17:58:36 +00:00
< 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 >
2023-08-26 04:56:32 +00:00
< 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 > For more options see the next question.< / p >
2023-10-22 22:38:21 +00:00
< 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 >
2023-08-28 17:58:36 +00:00
< 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 >
2023-08-26 04:56:32 +00:00
< p > Not yet, you can check < a href = "https://github.com/martinvonz/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 >
2023-08-28 17:58:36 +00:00
< h3 id = "how-can-i-keep-my-scratch-files-in-the-repository" > How can I keep my scratch files in the repository?< a class = "headerlink" href = "#how-can-i-keep-my-scratch-files-in-the-repository" title = "Permanent link" > ¶ < / a > < / h3 >
2023-08-26 04:56:32 +00:00
< 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 < 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).< / p >
< p > You can find more details on < code > gitignore< / code > files < a href = "https://git-scm.com/docs/gitignore" > here< / a > .< / p >
2023-08-28 17:58:36 +00:00
< h3 id = "how-can-i-keep-local-changes-around-but-not-use-them-for-pull-requests" > How can I keep local changes around, but not use them for Pull Requests?< a class = "headerlink" href = "#how-can-i-keep-local-changes-around-but-not-use-them-for-pull-requests" title = "Permanent link" > ¶ < / a > < / h3 >
2023-08-26 04:56:32 +00:00
< p > In general, you should separate out the changes to their own commit (using
e.g. < code > jj split< / code > ). After that, one possible workflow is to rebase your pending
PRs on top of the commit with the local changes. Then, just before pushing to a
remote, use < code > jj rebase -s child_of_commit_with_local_changes -d main< / code > to move
the PRs back on top of < code > main< / code > .< / p >
< p > If you have several PRs, you can
try < code > jj rebase -s all:commit_with_local_changes+ -d main< / code >
(note the < code > +< / code > ) to move them all at once.< / p >
< p > An alternative workflow would be to rebase the commit with local changes on
top of the PR you're working on and then do < code > jj new commit_with_local_changes< / code > .
You'll then need to use < code > jj new --before< / code > to create new commits
and < code > jj move --to< / code >
to move new changes into the correct commits.< / p >
2024-01-29 19:42:58 +00:00
< 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 >
2023-09-08 16:00:43 +00:00
< p > Use < code > jj obslog -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 >
2023-11-01 07:56:36 +00:00
< 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 >
< p > Usually, the different commits associated with the divergent change ID should all
appear in the log, but due to #2476, they may not. If that happens, you can
either use < code > jj log -r 'all()' | grep < change id> < / code > or disable the
< code > revsets.short-prefixes< / code > config option.< / p >
< h3 id = "how-do-i-deal-with-conflicted-branches-after-branch-name" > How do I deal with conflicted branches ('??' after branch name)?< a class = "headerlink" href = "#how-do-i-deal-with-conflicted-branches-after-branch-name" title = "Permanent link" > ¶ < / a > < / h3 >
< p > A < a href = "../branches/#conflicts" > conflicted branch< / a > is a branch that refers to multiple
different commits because jj couldn't fully resolve its desired position.
Resolving conflicted branches is usually done by setting the branch to the
correct commit using < code > jj branch set < commit ID> < / code > .< / p >
< p > Usually, the different commits associated with the conflicted branch should all
appear in the log, but if they don't you can use < code > jj branch list< / code > to show all the
commits associated with it.< / p >
2024-01-01 20:08:58 +00:00
< 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 push < code > git push< / code > your < code > HEAD< / code > into the remote Gerrit branch
< code > refs/for/$BRANCH< / code > , where < code > $BRANCH< / code > is the base branch you want your changes to
go to.< / p >
< p > We hope to integrate with Gerrit natively in the future.< / p >
2023-08-26 04:56:32 +00:00
2024-01-07 20:46:19 +00:00
2023-08-26 04:56:32 +00:00
< / article >
< / div >
2024-01-07 20:46:19 +00:00
< script > var target = document . getElementById ( location . hash . slice ( 1 ) ) ; target && target . name && ( target . checked = target . name . startsWith ( "__tabbed_" ) ) < / script >
2023-08-26 04:56:32 +00:00
< / 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 >
2023-11-04 02:16:06 +00:00
< script id = "__config" type = "application/json" > { "base" : ".." , "features" : [ ] , "search" : "../assets/javascripts/workers/search.f886a092.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 >
2023-08-26 04:56:32 +00:00
2024-01-07 20:46:19 +00:00
< script src = "../assets/javascripts/bundle.d7c377c4.min.js" > < / script >
2023-08-26 04:56:32 +00:00
< / body >
< / html >
