Re:Stacked Diffs with git rebase —onto
by baq on Friday December 05, 2025 @06:35AM
(#46159927)
It’s one of the core features that rebases, including branch names (bookmarks in jj) work ‘correctly’. You can rebase whole dags, including merges, with multiple named heads with just one jj rebase -b.
[ Parent
| on HN ]
note that bookmarks don't float, unlike git branches, so if your pattern is to produce a lot of commits, you'll want something to keep your jj bookmarks pointing to the top of your pile of commits.
this is less of a problem if you're more into the 1 change == 1 commit workflow.
There's a very common alias `jj tug` for this case:
tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"]
Thanks, I replaced my Frankenstein's monster of a parsing pipeline with this, very useful!
This looks like any other git arcane incantation. If this is a common pattern and jj aims to make things easier, should probably be part of the core commands, no?
Re:Stacked Diffs with git rebase —onto
by steveklabnik on Friday December 05, 2025 @05:37PM
(#46168320)
It's something that makes a specific workflow easier, a lot of folks that use jj don't necessarily use that workflow.
That doesn't mean it couldn't be a core command someday, but given that the alias works well for people, there's not a ton of reason to make a whole new command. You configure the alias and you're off to the races.
There's an experimental-advance-branches feature which helps with that!