1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26

diff --git a/home/nogui/jj.nix b/home/nogui/jj.nix
index 9a9e48f428bd2cc08159481de2a50b3c8eeaf65b..baac13ee18764603ddb355dfad536a095392f2fd 100644
--- a/home/nogui/jj.nix
+++ b/home/nogui/jj.nix
@@ -18,7 +18,20 @@         editor = "hx";
         paginate = "never";
         default-command = "status";
       };
-      templates.git_push_bookmark = ''"change/" ++ change_id.short()'';
+      templates = {
+        git_push_bookmark = ''"change/" ++ change_id.short()'';
+        draft_commit_description = ''
+          concat(
+            coalesce(description, default_commit_description, "\n"),
+            surround(
+              "\nJJ: This commit contains the following changes:\n", "",
+              indent("JJ:     ", diff.stat(72)),
+            ),
+            "\nJJ: ignore-rest\n",
+            diff.git(),
+          )
+        '';
+      };
       signing = {
         behavior = "own";
         backend = "ssh";