mirror of
https://github.com/RGBCube/ncc
synced 2025-07-30 11:37:44 +00:00
Fix // in git config and sort tags and branches. Also enable rerere.
This commit is contained in:
parent
02ba5f6511
commit
e4353727b1
1 changed files with 7 additions and 3 deletions
|
@ -83,13 +83,16 @@
|
|||
background = "dark";
|
||||
};
|
||||
|
||||
extraConfig = {
|
||||
extraConfig = lib.recursiveUpdate {
|
||||
init.defaultBranch = "master";
|
||||
|
||||
commit.verbose = true;
|
||||
|
||||
log.date = "iso";
|
||||
|
||||
branch.sort = "-committerdate";
|
||||
tag.sort = "version:refname";
|
||||
|
||||
diff.algorithm = "histogram";
|
||||
diff.colorMoved = "default";
|
||||
|
||||
|
@ -100,6 +103,7 @@
|
|||
|
||||
rebase.autoSquash = true;
|
||||
rebase.autoStash = true;
|
||||
rerere.enabled = true;
|
||||
|
||||
fetch.fsckObjects = true;
|
||||
receive.fsckObjects = true;
|
||||
|
@ -111,12 +115,12 @@
|
|||
core.sshCommand = "ssh -i ~/.ssh/id";
|
||||
url."ssh://git@github.com/".insteadOf = "https://github.com/";
|
||||
url."ssh://forgejo@rgbcu.be:2222/".insteadOf = "https://git.rgbcu.be/";
|
||||
} // lib.optionalAttrs ulib.isDesktop {
|
||||
} (lib.optionalAttrs ulib.isDesktop {
|
||||
commit.gpgSign = true;
|
||||
tag.gpgSign = true;
|
||||
gpg.format = "ssh";
|
||||
user.signingKey = "~/.ssh/id";
|
||||
};
|
||||
});
|
||||
};
|
||||
})
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue