Skip to content

Commit

Permalink
docs: Add a short section on branch movement.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
PhilipMetzger committed Mar 2, 2024
1 parent 8558685 commit 494eba8
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions docs/branches.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 494eba8

Please sign in to comment.