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-09-01 03:44:48 +00:00
< link rel = "canonical" href = "https://martinvonz.github.io/jj/prerelease/FAQ.html" >
2023-08-26 04:56:32 +00:00
2023-09-01 03:44:48 +00:00
< link rel = "prev" href = "github.html" >
2023-08-26 04:56:32 +00:00
2023-09-01 03:44:48 +00:00
< link rel = "next" href = "working-copy.html" >
2023-08-26 04:56:32 +00:00
2023-09-01 03:44:48 +00:00
< link rel = "icon" href = "assets/images/favicon.png" >
2023-08-28 17:58:36 +00:00
< meta name = "generator" content = "mkdocs-1.5.2, mkdocs-material-9.2.5" >
2023-08-26 04:56:32 +00:00
< title > FAQ - Jujutsu docs< / title >
2023-09-01 03:44:48 +00:00
< link rel = "stylesheet" href = "assets/stylesheets/main.0e669242.min.css" >
2023-08-26 04:56:32 +00:00
2023-09-01 03:44:48 +00:00
< script src = "https://unpkg.com/iframe-worker/shim" > < / script >
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-09-01 03:44:48 +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 >
< body dir = "ltr" >
< script > var palette = _ _md _get ( "__palette" ) ; if ( palette && "object" == typeof palette . color ) for ( var key of Object . keys ( palette . color ) ) document . body . setAttribute ( "data-md-color-" + key , palette . color [ key ] ) < / script >
< 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-09-01 03:44:48 +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 >
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-09-01 03:44:48 +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 >
< li class = "md-nav__item md-nav__item--nested" >
< input class = "md-nav__toggle md-toggle " type = "checkbox" id = "__nav_1" >
< label class = "md-nav__link" for = "__nav_1" id = "__nav_1_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_1_label" aria-expanded = "false" >
< label class = "md-nav__title" for = "__nav_1" >
< span class = "md-nav__icon md-icon" > < / span >
Getting started
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "install-and-setup.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Installation and Setup
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "tutorial.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Tutorial and Birds-Eye View
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "github.html" 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 >
< / 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 >
2023-09-01 03:44:48 +00:00
< a href = "FAQ.html" 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" >
Why does my branch not move to the new commit after jj new/commit?
< / 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" >
I made a commit and jj git push --all says "Nothing changed" instead of pushing it. What do I do?
< / 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" >
Where is my commit, why is it not visible in jj log?
< / 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" >
Can I prevent Jujutsu from recording my unfinished work? I'm not ready to commit it.
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#can-i-add-a-portion-of-the-edits-i-made-to-a-file-similarly-to-git-add-p-or-hg-commit-i" class = "md-nav__link" >
Can I add a portion of the edits I made to a file, similarly to git add -p or hg commit -i?
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#is-there-something-like-git-rebase-interactive-or-hg-histedit" class = "md-nav__link" >
Is there something like git rebase --interactive or hg histedit?
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#how-can-i-keep-my-scratch-files-in-the-repository" class = "md-nav__link" >
How can I keep my scratch files in the repository?
< / 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" >
How can I keep local changes around, but not use them for Pull Requests?
< / 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_3" >
< label class = "md-nav__link" for = "__nav_3" id = "__nav_3_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_3_label" aria-expanded = "false" >
< label class = "md-nav__title" for = "__nav_3" >
< span class = "md-nav__icon md-icon" > < / span >
Concepts
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "working-copy.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Working Copy
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "branches.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Branches
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "conflicts.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Conflicts
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "operation-log.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Operation Log
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "glossary.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< 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_4" >
< label class = "md-nav__link" for = "__nav_4" id = "__nav_4_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_4_label" aria-expanded = "false" >
< label class = "md-nav__title" for = "__nav_4" >
< span class = "md-nav__icon md-icon" > < / span >
Configuration
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "config.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Settings
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "revsets.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Revset language
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "templates.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< 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_5" >
< label class = "md-nav__link" for = "__nav_5" id = "__nav_5_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_5_label" aria-expanded = "false" >
< label class = "md-nav__title" for = "__nav_5" >
< span class = "md-nav__icon md-icon" > < / span >
Comparisons
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "git-comparison.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Git comparison
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "git-compatibility.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Git compatibility
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "sapling-comparison.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Sapling
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "related-work.html" 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 >
< li class = "md-nav__item md-nav__item--nested" >
< input class = "md-nav__toggle md-toggle " type = "checkbox" id = "__nav_6" >
< label class = "md-nav__link" for = "__nav_6" id = "__nav_6_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_6_label" aria-expanded = "false" >
< label class = "md-nav__title" for = "__nav_6" >
< span class = "md-nav__icon md-icon" > < / span >
Technical details
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "technical/architecture.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Architecture
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "technical/concurrency.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
Concurrency
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "technical/conflicts.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< 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_7" >
< label class = "md-nav__link" for = "__nav_7" id = "__nav_7_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_7_label" aria-expanded = "false" >
< label class = "md-nav__title" for = "__nav_7" >
< span class = "md-nav__icon md-icon" > < / span >
Contributing
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "contributing.html" 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 >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "code-of-conduct.html" 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 >
< 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" >
Design docs
< / 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 >
Design docs
< / label >
< ul class = "md-nav__list" data-md-scrollfix >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "design/git-submodules.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
git-submodules
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "design/git-submodule-storage.html" class = "md-nav__link" >
2023-08-26 04:56:32 +00:00
< span class = "md-ellipsis" >
git-submodule-storage
< / span >
< / a >
< / li >
< li class = "md-nav__item" >
2023-09-01 03:44:48 +00:00
< a href = "design/tracking-branches.html" 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" >
Why does my branch not move to the new commit after jj new/commit?
< / 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" >
I made a commit and jj git push --all says "Nothing changed" instead of pushing it. What do I do?
< / 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" >
Where is my commit, why is it not visible in jj log?
< / 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" >
Can I prevent Jujutsu from recording my unfinished work? I'm not ready to commit it.
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#can-i-add-a-portion-of-the-edits-i-made-to-a-file-similarly-to-git-add-p-or-hg-commit-i" class = "md-nav__link" >
Can I add a portion of the edits I made to a file, similarly to git add -p or hg commit -i?
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#is-there-something-like-git-rebase-interactive-or-hg-histedit" class = "md-nav__link" >
Is there something like git rebase --interactive or hg histedit?
< / a >
< / li >
< li class = "md-nav__item" >
< a href = "#how-can-i-keep-my-scratch-files-in-the-repository" class = "md-nav__link" >
How can I keep my scratch files in the repository?
< / 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" >
How can I keep local changes around, but not use them for Pull Requests?
< / a >
< / 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-09-01 03:44:48 +00:00
< code > revsets.log< / code > by default. You can change it as described in < a href = "config.html" > 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-09-01 03:44:48 +00:00
< p > See < a href = "revsets.html" > revsets< / a > and < a href = "templates.html" > templates< / a > for further guidance.< / 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-08-28 17:58:36 +00:00
< h3 id = "can-i-add-a-portion-of-the-edits-i-made-to-a-file-similarly-to-git-add-p-or-hg-commit-i" > Can I add a portion of the edits I made to a file, similarly to < code > git add -p< / code > or < code > hg commit -i< / code > ?< a class = "headerlink" href = "#can-i-add-a-portion-of-the-edits-i-made-to-a-file-similarly-to-git-add-p-or-hg-commit-i" title = "Permanent link" > ¶ < / a > < / h3 >
2023-08-26 04:56:32 +00:00
< p > At the moment the best options to partially add a file are: < code > jj split< / code > ,
< code > jj amend -i< / code > and < code > jj move -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 >
< / article >
< / div >
< / 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-09-01 03:44:48 +00:00
< script id = "__config" type = "application/json" > { "base" : "." , "features" : [ ] , "search" : "assets/javascripts/workers/search.dfff1995.min.js" , "translations" : { "clipboard.copied" : "Copied to clipboard" , "clipboard.copy" : "Copy to clipboard" , "search.result.more.one" : "1 more on this page" , "search.result.more.other" : "# more on this page" , "search.result.none" : "No matching documents" , "search.result.one" : "1 matching document" , "search.result.other" : "# matching documents" , "search.result.placeholder" : "Type to start searching" , "search.result.term.missing" : "Missing" , "select.version" : "Select version" } , "version" : { "provider" : "mike" } } < / script >
2023-08-26 04:56:32 +00:00
2023-09-01 03:44:48 +00:00
< script src = "assets/javascripts/bundle.78eede0e.min.js" > < / script >
2023-08-26 04:56:32 +00:00
< / body >
< / html >
