diff --git a/machines/moritz-desktop/configuration.nix b/machines/moritz-desktop/configuration.nix index 51c2cbe..0ab1f1c 100644 --- a/machines/moritz-desktop/configuration.nix +++ b/machines/moritz-desktop/configuration.nix @@ -54,12 +54,25 @@ name = "Moritz Böhme"; }; ui.paginate = "never"; + ui.default-command = "log"; signing = { behavior = "drop"; backend = "gpg"; key = "0x970C6E89EB0547A9"; }; git.sign-on-push = true; + aliases = { + tug = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "closest_pushable(@)"]; + mm-update = ["rebase" "--source" "closest_merge(@)" "--destination" "all:closest_merge(@)-"]; + mm-rebase = ["rebase" "--source" "all:roots(trunk()..closest_merge(@))"]; + }; + revset-aliases = { + "closest_bookmark(to)" = "heads(::to & bookmarks())"; + "closest_pushable(to)" = "heads(::to & mutable() & ~description(exact:'') & (~empty() | merges()) & ~private())"; + "closest_merge(to)" = "heads(::to & merges())"; + "private()" = "description(glob:'wip:*') | description(glob:'private:*')"; + }; + git.private-commits = "private()"; }; };