Find the closest bookmark in history to advance it forward

[jennings]

When appending a new commit to a branch using jj commit, I need to find the "closest" bookmark to move it forward. Is there a shorter way to do this besides jj bookmark set my-bookmark -r @-?

[jennings]

The revset to find the commit with the bookmark closest to @ is heads(::@ | bookmarks()).

Some people in the jj community have an alias they call jj tug that uses this revset to advance the closest bookmark. Configuration:

[revset-aliases]
'closest_bookmark(to)' = 'heads(::to | bookmarks())'

[aliases]
tug = ["bookmark", "move", "--from", "closest_bookmark(@-)", "--to", "@-"]

Usage:

$ jj new my-feature

# work work work

$ jj commit -m "Add some changes"
$ jj tug

# The bookmark my-feature is now at @-

If you want to move the bookmark to @ instead of @-, substitute @ in the definition of the tug alias.

[bryceberger]

Note that this doesn't play very nice with the megamerge workflow.

o current work
o merge point
|\
| o bookmark A
o | bookmark B
|/
o trunk

closest_bookmark() will see both bookmarks, and move both of them.

[joyously]

Read about the --advance-branches feature request : #2338

[emesterhazy]

+1, please take a look and see if this meets your needs. There is additional discussion about it here as well: #3549