← Back to context

Comment by baq

2 months ago

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.

8 comments

baq

Reply
gcr  2 months ago

To expand: In jj, bookmarks point to "changes," not commits. Rebases, history manipulations, etc. preserve change ID, so this "just works."

arccy  2 months ago

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.

  • pimeys  2 months ago

    There's a very common alias `jj tug` for this case:

      tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"]

    It moves the nearest bookmark to the commit before the current one (which should be your working commit).

    • mhitza  2 months ago

      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?

      1 reply →

    • stavros  2 months ago

      Thanks, I replaced my Frankenstein's monster of a parsing pipeline with this, very useful!