Prevent force-pushing when working with Git remotes (for newbies...)?

[kastl-ars]

Hi all,

as I learnt in the documentation, by default jj behaves like git push --force-with-lease when running jj git push.
https://jj-vcs.github.io/jj/latest/bookmarks/#pushing-bookmarks-safety-checks

As I am just starting out using jj, I would like to disable this behavior to avoid accidents while getting used to jj. Is there a way to do that?

In my understanding this goes against the idea of jj doing automatic rebases of child changes etc., which I find very useful. But it will take some time to get my head around that...

Kind Regards,
Johannes

[gtsiam]

jj git push is similar, but not identical to git push --force-with-lease. Mainly:

The local bookmark must not be conflicted. If it is, you would need to use jj bookmark set, for example, to resolve the conflict.

So, as long as you do not explicitly change the relevant bookmark, you are good.

If you want stronger guarantees for "upstream" / "trunk" bookmarks, consider using immutable commits.

[kastl-ars]

Thanks I will have a look!

[jennings]

To get you started, if you would like the rule "anything pushed to a remote is immutable", you would use this configuration:

[revset-aliases]
'immutable_heads()' = 'builtin_immutable_heads() | remote_branches()`

The built-in value is trunk() | tags() | untracked_remote_branches(), so this simply adds tracked remote branches to the list.

Immutability can be overridden for an individual command by adding --ignore-immutable, for example: jj rebase -d main -b my-branch --ignore-immutable