Replies: 1 comment 1 reply
-
There's #1039 for that command and @essiene is working on it. It also is a long desired feature for a longtime user like me. It does mean that you'll need to use the workarounds you posted above until exists. |
Beta Was this translation helpful? Give feedback.
1 reply
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
TL;DR - What's the equivalent of git-branchless's
git sync
injj
?Longer explanation:
I frequently have five or six anonymous branches that I'm working on in a given repo, e.g.
Now I merge in
Change #1
(or I just fetch other people's changes), andmain
moves, e.g.What workflow are people using to rebase all those changes back onto
main
? For example:jj rebase -s <first revision> -d main
for each branch?jj rebase -b 'all:heads(all() ~ main)' -d main
gets the job done (no idea if that's the best way to do it, I'm bad at revsets)jj rebase -s 'all:roots(main..bookmarks(glob:"brandon/*"))' -d main --ignore-immutable
And then there's the approach Chris Krycho uses, where he has a
wip
revision with all his actual branches as parents, and then he doesjj rebase -b all:wip -d main
All of these work, but I'm wondering if there's some canonical way that makes sense for the common case and people recommend for one reason or another.
Beta Was this translation helpful? Give feedback.
All reactions