4 ms·
I have a question and you might have an idea about this: I have a workflow where I have my main and a bunch of branches that are children of other branches. So
by constantius 1y ago
I have a question and you might have an idea about this:
I have a workflow where I have my main and a bunch of branches that are children of other branches. So: main, branch_a, branch_a_1, branch_a_2, branch_a_1_x, etc. Probably not a good workflow, but that's what I do.
I keep editing old commits in my branches to have clean, atomic commits, which fucks up my branch structure and I need to cascade-rebase everything manually.
Do I understand correctly that jj does it automatically?
- steveklabnik 1y agoThat's correct, it will do the cascade rebase of everything automatically.
- constantius 1y agoThanks Steve, and for the tutorial too!
- 1718627440 1y agogit rebase --update-refs
- martinvonz 1y agoThat won't update sibling branches
- 1718627440 11mo agoIt won't update (sibling) branches, that are checked out. --update-refs, --no-update-refs Automatically force-update any branches that point to commits that are being rebased. Any branches that are checked out in a worktree are not updated in this way. If the configuration variable rebase.updateRefs is set, then this option can be used to override and disable this setting.
- Iwan-Zotow 1y agoWon't work, only tree