From efba4c02890bfe572f7fec68bca11705ed022bfa Mon Sep 17 00:00:00 2001 From: sgoudham Date: Wed, 13 Mar 2024 04:00:52 +0000 Subject: [PATCH] feat(git): add some popular options ref: https://jvns.ca/blog/2024/02/16/popular-git-config-options/ --- home/apps/git.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/home/apps/git.nix b/home/apps/git.nix index 2297fff..af07e15 100644 --- a/home/apps/git.nix +++ b/home/apps/git.nix @@ -35,12 +35,22 @@ "node_modules/" ]; extraConfig = { - push.autoSetupRemote = true; + branch.sort = "-committerdate"; core = { autocrlf = "input"; editor = "nvim"; }; + commit.verbose = true; + fetch = { + fsckobjects = true; + prune = true; + prunetags = true; + }; init.defaultBranch = "main"; + merge.conflictstyle = "zdiff3"; + push.autoSetupRemote = true; + receive.fsckObjects = true; + transfer.fsckobjects = true; }; }; }