diff --git a/modules/features/programs/cli/vc-jujutsu.nix b/modules/features/programs/cli/vc-jujutsu.nix index deaaf28..ff6aae4 100644 --- a/modules/features/programs/cli/vc-jujutsu.nix +++ b/modules/features/programs/cli/vc-jujutsu.nix @@ -16,7 +16,39 @@ behavior = "own"; backend = "gpg"; }; + revset-aliases = { + "closest_merge(to)" = "heads(::to & merges())"; + }; aliases = { + set-trunk = [ + "config" + "set" + "--repo" + "revset-aliases.'trunk()'" + ]; + + stack = [ + "rebase" + "--after" + "trunk()" + "--before" + "closest_merge(@)" + "--revision" + ]; + + stage = [ + "stack" + "closest_merge(@)+:: ~ empty()" + ]; + + restack = [ + "rebase" + "--onto" + "trunk()" + "--source" + "roots(trunk()..) & mutable()" + "--simplify-parents" + ]; c = [ "commit" ]; ci = [ "commit"