From 2d62517a51dea42f5a9b09ea619903becf76f16a Mon Sep 17 00:00:00 2001
From: Matthew Ryan Dillon <matthew@akdillon.net>
Date: Mon, 8 Dec 2025 16:09:53 -0500
Subject: [PATCH] jj: remove `merge` commit notion (since im no longer using)

---
 home/private_dot_config/jj/config.toml.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/private_dot_config/jj/config.toml.tmpl b/home/private_dot_config/jj/config.toml.tmpl
index 8489b7f..c4eb183 100644
--- a/home/private_dot_config/jj/config.toml.tmpl
+++ b/home/private_dot_config/jj/config.toml.tmpl
@@ -7,7 +7,7 @@ email = {{ .email_personal | quote }}
 {{- end }}
 
 [git]
-private-commits = "description(glob:'private:*') | bookmarks('merge')"
+private-commits = "description(glob:'private:*')"
 
 [templates]
 {{- if eq .hosttype "work" }}