From 494eba82b58be8eae1f8502cf8770eb88a5cedbf Mon Sep 17 00:00:00 2001 From: Philip Metzger Date: Wed, 28 Feb 2024 19:05:34 +0100 Subject: [PATCH] docs: Add a short section on branch movement. 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. --- docs/branches.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/branches.md b/docs/branches.md index 0173b52664..734fd77e34 100644 --- a/docs/branches.md +++ b/docs/branches.md @@ -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