From e53e8efb682d2f9ea8c42297069399201ad03fcc Mon Sep 17 00:00:00 2001 From: Matthew Ryan Dillon Date: Thu, 13 Mar 2025 14:32:38 -0400 Subject: [PATCH] jj: ignore octopus merge commits --- .../private_Application Support/private_jj/config.toml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/private_Library/private_Application Support/private_jj/config.toml.tmpl b/home/private_Library/private_Application Support/private_jj/config.toml.tmpl index acec654..02ea816 100644 --- a/home/private_Library/private_Application Support/private_jj/config.toml.tmpl +++ b/home/private_Library/private_Application Support/private_jj/config.toml.tmpl @@ -4,7 +4,7 @@ email = {{ .email_personal | quote }} [git] push-bookmark-prefix = "{{ .github_personal }}_jj_" -private-commits = "description(glob:'private:*')" +private-commits = "description(glob:'private:*') | bookmarks('merge')" [revset-aliases] 'stack()' = 'main..@'