From a1827c79f4c3b05c4aef17b51872276112600d38 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 3 Mar 2025 13:13:28 +0100 Subject: ... --- users/gkleen/default.nix | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'users/gkleen/default.nix') diff --git a/users/gkleen/default.nix b/users/gkleen/default.nix index 4ddf4be3..074d4866 100644 --- a/users/gkleen/default.nix +++ b/users/gkleen/default.nix @@ -29,9 +29,38 @@ userName = "Gregor Kleen"; delta.enable = true; extraConfig = { - pull.rebase = false; + core.excludesfile = toString ./gitignore; + pull.rebase = true; submodule.recurse = true; init.defaultBranch = "main"; + column.ui = "auto"; + branch.sort = "-comitterdate"; + tag.sort = "version:refname"; + diff = { + algorithm = "histogram"; + colorMoved = "plain"; + mnemonicPrefix = true; + renames = true; + }; + push = { + default = "simple"; + autoSetupRemote = true; + followTags = true; + }; + fetch = { + prune = true; + pruneTags = true; + all = true; + }; + rerere = { + enabled = true; + autoupdate = true; + }; + rebase = { + autoSquash = true; + autoStash = true; + updateRefs = true; + }; }; }; -- cgit v1.2.3