From 2fc887b12e9e2fc71d0007c847ac2c44dd9d1c3b Mon Sep 17 00:00:00 2001 From: Adam Hellberg Date: Wed, 13 Aug 2025 22:02:22 +0200 Subject: [PATCH] [jj] Update deprecated config values --- jj/.config/jj/config.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jj/.config/jj/config.toml b/jj/.config/jj/config.toml index 9314608..47b2784 100644 --- a/jj/.config/jj/config.toml +++ b/jj/.config/jj/config.toml @@ -21,13 +21,14 @@ program = "/opt/1Password/op-ssh-sign" auto-local-bookmark = false colocate = true private-commits = "blacklist()" -push-bookmark-prefix = "sharparam/push-" +# push-bookmark-prefix = "sharparam/push-" sign-on-push = true write-change-id-header = true [ui] default-command = "log" -diff.tool = "difft" +# diff.tool = "difft" +diff-formatter = "difft" merge-editor = "mergiraf" show-cryptographic-signatures = true @@ -71,6 +72,8 @@ concat( ) ''' +git_push_bookmark = '"sharparam/push-" ++ change_id.short()' + [template-aliases] "format_short_signature(sig)" = '"<" ++ if(sig.email(), sig.email(), label("text warning", "NO EMAIL")) ++ ">"' "format_short_cryptographic_signature(sig)" = 'if(sig, sig.status(), "(no sig)")' -- 2.51.2