scriptlib

programs/jj/default.nix

@@ -33,7 +33,6 @@
         # diff-editor = "${pkgs.meld}/bin/meld";
       };
 
-      # core.fsmonitor = "${pkgs.watchman}/bin/watchman";
       core.fsmonitor = "watchman";
       core.watchman.register-snapshot-trigger = true;
 
@@ -60,7 +59,7 @@
           "--from"
           "closest_bookmark(@-)"
           "--to"
-          "@-"
+          "@"
         ];
         catchup = [
           "rebase"
@@ -70,6 +69,15 @@
           "tronk()"
           "--skip-emptied"
         ];
+        move = [
+          "rebase"
+          "-r"
+        ];
+        mdiff = [
+          "diff"
+          "--from"
+          "tronk()"
+        ];
       };
 
       templates = {
@@ -119,7 +127,7 @@
 
       git = {
         push-bookmark-prefix = "jdonszelmann/";
-        private-commits = "description(glob:'wip:*')";
+        private-commits = "description(glob:'wip:*') | description(glob:'trial:*')";
         write-change-id-header = true;
 
         fetch = [