(jj-for-everyone.github.io)

434 points Bogdanp | 1 comments | 31 Aug 25 15:31 UTC | HN request time: 0.245s | source

Show context

zamalek ◴[31 Aug 25 17:21 UTC] No.45084963[source]▶

I'm a through-and-through JJ convert. One papercut I have experienced a few times (though I am getting much better at avoiding) is what to do when I forget to `jj new`. Assuming that I have pushed the current bookmark to the remote, is there any way to recover a new change that is the diff against the remote? I have tried rebasing, but that leads to bookmark ambiguity instead of the solution I'm looking for.

replies(5): >>45084985 #>>45085090 #>>45085256 #>>45085704 #>>45085910 #

1. benoitg ◴[31 Aug 25 18:34 UTC] No.45085704[source]▶

>>45084963 #

I fixed this by changing the default immutable heads to include all remote bookmarks. This way, you cannot edit them and the new commit is automatically created when you push to the remote branch.

  [revset-aliases]
  "immutable_heads()" = "trunk() | tags() | remote_bookmarks()"

↑

Jujutsu for everyone