1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-31 20:17:45 +00:00

Fix // in git config and sort tags and branches. Also enable rerere.

This commit is contained in:
RGBCube 2024-03-02 10:35:54 +03:00
parent 02ba5f6511
commit e4353727b1
No known key found for this signature in database

View file

@ -83,13 +83,16 @@
background = "dark"; background = "dark";
}; };
extraConfig = { extraConfig = lib.recursiveUpdate {
init.defaultBranch = "master"; init.defaultBranch = "master";
commit.verbose = true; commit.verbose = true;
log.date = "iso"; log.date = "iso";
branch.sort = "-committerdate";
tag.sort = "version:refname";
diff.algorithm = "histogram"; diff.algorithm = "histogram";
diff.colorMoved = "default"; diff.colorMoved = "default";
@ -100,6 +103,7 @@
rebase.autoSquash = true; rebase.autoSquash = true;
rebase.autoStash = true; rebase.autoStash = true;
rerere.enabled = true;
fetch.fsckObjects = true; fetch.fsckObjects = true;
receive.fsckObjects = true; receive.fsckObjects = true;
@ -111,12 +115,12 @@
core.sshCommand = "ssh -i ~/.ssh/id"; core.sshCommand = "ssh -i ~/.ssh/id";
url."ssh://git@github.com/".insteadOf = "https://github.com/"; url."ssh://git@github.com/".insteadOf = "https://github.com/";
url."ssh://forgejo@rgbcu.be:2222/".insteadOf = "https://git.rgbcu.be/"; url."ssh://forgejo@rgbcu.be:2222/".insteadOf = "https://git.rgbcu.be/";
} // lib.optionalAttrs ulib.isDesktop { } (lib.optionalAttrs ulib.isDesktop {
commit.gpgSign = true; commit.gpgSign = true;
tag.gpgSign = true; tag.gpgSign = true;
gpg.format = "ssh"; gpg.format = "ssh";
user.signingKey = "~/.ssh/id"; user.signingKey = "~/.ssh/id";
}; });
}; };
}) })