From 565797625dcd6a8c957986cab574a0f738b62cbe Mon Sep 17 00:00:00 2001
From: sloane <git@sloanelybutsurely.com>
Date: Fri, 9 May 2025 21:34:44 -0400
Subject: [PATCH] add some jj aliases
---
home-manager/default.nix | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 059c901..5941177 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -204,6 +204,7 @@
revsets.log = "trunk() | ancestors(reachable(@ | mine(), mutable()), 2) | @";
git = {
push-bookmark-prefix = "sloane/push-";
+ push-new-bookmarks = true;
private-commits = "wip | nocommit | dev-only";
};
revset-aliases = {
@@ -211,6 +212,15 @@
nocommit = ''description(regex:"^\\[(nocommit|NOCOMMIT)\\]|(nocommit|NOCOMMIT):?")'';
dev-only = ''description(regex:"^\\[(dev-only|DEV-ONLY)\\]|(dev-only|DEV-ONLY):?")'';
current = ''(bookmarks() | wip | dev-only) & mine()'';
+ "closest_bookmark(to)" = "heads(::to & bookmarks())";
+ };
+ aliases = {
+ r = ["rebase"];
+ s = ["squash"];
+ n = ["new"];
+ e = ["edit"];
+ tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];
+ catchup = ["rebase" "-b" "all(current() ~immutable())" "-d" "trunk()" "--skip-emptied"];
};
};
};