From 90df62941b112fea8109808a8b8ac97fac99cb4b Mon Sep 17 00:00:00 2001 From: Oleksandr Smirnov Date: Fri, 5 Dec 2025 00:22:18 +0200 Subject: [PATCH] jj: update to 0.36; add private commits --- config/jj/config.toml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/jj/config.toml b/config/jj/config.toml index 60a12a4..8da8649 100644 --- a/config/jj/config.toml +++ b/config/jj/config.toml @@ -17,7 +17,12 @@ key = "~/.ssh/git-sign.pub" [git] sign-on-push = true -auto-local-bookmark = true +private-commits = "description(glob:'wip:*') | description(glob:'private:*')" + +[remotes] +origin.auto-track-bookmarks = "glob:*" +olexsmir.auto-track-bookmarks = "glob:*" +upstream.auto-track-bookmarks = "main | master" [aliases] l = ["log", "-r", "ancestors(reachable(@, mutable()), 2)"] @@ -25,6 +30,7 @@ llog = ["log", "-r", ".."] tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"] [templates] +git_push_bookmark = '"olexsmir/" ++ change_id.short()' draft_commit_description = ''' concat( coalesce(description, default_commit_description, "\n"),