From 7529990566b38728f61f369b085fb51cea1cbde7 Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Thu, 13 Mar 2025 08:49:35 -0400 Subject: [PATCH] update git conf --- home-manager/git/default.nix | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/home-manager/git/default.nix b/home-manager/git/default.nix index 0581c06..3bee355 100644 --- a/home-manager/git/default.nix +++ b/home-manager/git/default.nix @@ -21,6 +21,38 @@ safecrlf = "true"; excludesFile = "~/.config/git/.gitignore"; }; + column = { + ui = "auto"; + }; + fetch = { + prune = true; + pruneTags = true; + all = true; + }; + help = { + autocorrect = true; + }; + diff = { + algorithm = "histogram"; + colorMoved = "plain"; + mnemonicPrefix = true; + renames = true; + }; + rebase = { + autoSquash = true; + autoStash = true; + updateRefs = true; + }; + rerere = { + enabled = true; + autoupdate = true; + }; + commit = { + verbose = true; + }; + branch = { + sort = "-committerdate"; + }; merge = { conflictstyle = "zdiff3"; };