jj: update `jj pull` to simplify parents, only sign on push
change qywnwsoxwuksywpxotnqtxzwrpkwzznz
commit 5fa387366ff1446417ff606825a2d75ba5bd1e86
author Alpha Chen <alpha@kejadlen.dev>
date
parent vmxmmytz
diff --git a/.config/jj/config.toml b/.config/jj/config.toml
index 0c66c078..9977c93f 100644
--- a/.config/jj/config.toml
+++ b/.config/jj/config.toml
@@ -38,6 +38,10 @@ backend = "ssh"
 key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINCttH8nEfk1uZ2291P4mbCoNcHxnr9iNBlbZckykeZ8"
 backends.ssh.program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
 
+# Don't sign on change modification since with fsmonitor, this winds up sporadically
+# triggering the 1Password auth dialog when I'm not actually interacting with the repo.
+behavior = "drop"
+
 [git]
 sign-on-push = true
 push-new-bookmarks = true
@@ -100,6 +104,7 @@ pr = ["util", "exec", "--", "bash", "-c", """
 pull = ["util", "exec", "--", "bash", "-c", """
   jj git fetch
   jj rebase --branch "visible_heads() & mutable()" --destination "trunk()"
+  jj simplify-parents -r "visible_heads() & mutable()"
 """]
 
 # https://github.com/jj-vcs/jj/discussions/3549