diff --git a/modules/common/jujutsu.nix b/modules/common/jujutsu.nix index a1c5878..e9f2029 100644 --- a/modules/common/jujutsu.nix +++ b/modules/common/jujutsu.nix @@ -20,7 +20,13 @@ in { user.name = "RGBCube"; user.email = "git@${mailDomain}"; - ui.default-command = "log"; + aliases.".." = [ "edit" "@-" ]; + aliases.",," = [ "edit" "@+" ]; + + revsets.log = "present(@) | present(trunk()) | ancestors(remote_bookmarks().., 2) | reachable(@, all())"; + + ui.default-command = "status"; + ui.diff-editor = ":builtin"; ui.diff.tool = [ "${getExe pkgs.difftastic}" "--color" "always" "$left" "$right" ]; @@ -31,6 +37,9 @@ in { git.push-bookmark-prefix = "change-"; git.subprocess = true; + git.fetch = [ "origin" "upstream" "rad" ]; + git.push = "origin"; # TODO: Find a way to make this become rad when origin is up to date. + signing.sign-all = true; signing.backend = "ssh"; signing.key = "~/.ssh/id";