all repos — nixfiles @ 6a8e456ae13aa78d01a5ccc9c5d586538bbdfc7e

System and user configuration, managed by nix and home-manager

git: add some interesting settings

Alan Pearce
commit

6a8e456ae13aa78d01a5ccc9c5d586538bbdfc7e

parent

6516c2559c4fe10dc3c32d824411a71c9f8cae07

1 file changed, 9 insertions(+), 2 deletions(-)

jump to
M user/settings/git.nixuser/settings/git.nix
@@ -32,21 +32,27 @@ };
pull = { rebase = true; }; + fetch = { + prune = true; + prunetags = true; + }; push = { default = "current"; + autoSetupRemote = true; followTags = true; }; rebase = { autosquash = true; + updateRefs = true; }; rerere = { - enable = true; + enabled = true; }; merge = { conflictStyle = "diff3"; }; diff = { - algorithm = "patience"; + algorithm = "histogram"; colorMoved = "default"; }; remote = {
@@ -58,6 +64,7 @@ };
"branch.main" = { rebase = false; }; + "url.git@github.com:".insteadOf = "https://github.com/"; }; signing = { key = "0xCD4BEB92A8D46583";