mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-29 16:07:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

docs: Add a short section on branch movement.

Browse source 
This is something which should've been written down long ago. This is a follow-up upon 
another question from Julia Evans in Discord. 

Thank you again for asking such good questions.
This commit is contained in:
Philip Metzger 2024-02-28 19:05:34 +01:00 committed by Philip Metzger
parent 85586854f2
commit 494eba82b5
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
docs/branches.md
View file

@ -138,6 +138,19 @@ Branches that already existed before the `jj git fetch` are not affected. This
is similar to Mercurial, which fetches all its bookmarks (equivalent to Git
branches) by default.
## Branch movement
Currently Jujutsu automatically moves local branches when these conditions are
met:
* When a commit has been rewritten (e.g, when you rebase) branches and the
working-copy will move along with it.
* When a commit has been abandoned, all associated branches will be moved
to its parent(s). If a working copy was pointing to the abandoned commit,
then a new working-copy commit will be created on top of the parent(s).
You could describe the movement as following along the change-id of the
current branch commit, even if it isn't entirely accurate.
## Conflicts