diff --git a/modules/home-manager/cli/git/default.nix b/modules/home-manager/cli/git/default.nix index 1426946..07ec476 100644 --- a/modules/home-manager/cli/git/default.nix +++ b/modules/home-manager/cli/git/default.nix @@ -38,14 +38,19 @@ in co = "checkout"; fa = "fetch --all"; far = "!git fa; git rebase"; - l = "log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"; - lg = "log --graph --decorate --pretty=oneline --abbrev-commit"; + l = "log --pretty=format:'%C(red)%h%C(reset) -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(dim white)<%an>%Creset'"; + la = "l --all"; + lg = "log --graph --abbrev-commit --decorate --format=format:'%C(red)%h%C(reset) ┬ %C(cyan)%aD%C(reset) %C(green)(%ar)%C(reset)%C(yellow)%d%C(reset) %C(dim white) <%an>%C(reset)%n'' └─ %C(white)%s%C(reset)'"; + lga = "lg --all"; pf = "push --force-with-lease"; rewrite = "!git commit --amend --no-edit && git push --force-with-lease"; st = "status -sb"; }; extraConfig = { - push = { + core = { + abbrev = 8; + }; + push = { autoSetupRemote = true; default = "current"; };