diff --git a/modules/hm/git.nix b/modules/hm/git.nix index b17bb24..5726c80 100644 --- a/modules/hm/git.nix +++ b/modules/hm/git.nix @@ -100,12 +100,14 @@ in # }; extraConfig = { "add.interactive".useBuiltin = false; - credential.helper = "libsecret"; + branch.sort = "-committerdate"; + column.ui = "auto"; commit.gpgSign = true; core = { editor = "hx"; fsmonitor = true; }; + credential.helper = "libsecret"; delta = { line-numbers = true; navigate = true; @@ -113,6 +115,7 @@ in wrap-max-lines = "unlimited"; }; diff = { + algorithm = "historgram"; colorMoved = "default"; guitool = "meld"; tool = "meld"; @@ -124,12 +127,15 @@ in tool = "meld"; }; pull.rebase = true; - rebase.autoStash = true; - rebase.autoSquash = true; + rebase = { + autoStash = true; + autoSquash = true; + }; rerere = { enabled = true; autoUpdate = true; }; + tag.sort = "version:refname"; user.signingKey = "berto.f@protonmail.com"; }; lfs.enable = true;