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

Configure git some more and add tig

Browse source
This commit is contained in:
RGBCube 2024-02-16 22:16:59 +03:00
parent 65c94efc82
commit 27fdc16996
No known key found for this signature in database
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/git.nix
View file

@ -34,6 +34,8 @@
gplr = "git pull --rebase"; gplr = "git pull --rebase";
gplff = "git pull --ff-only"; gplff = "git pull --ff-only";
gr = "git recent";
grb = "git rebase"; grb = "git rebase";
grba = "git rebase --abort"; grba = "git rebase --abort";
grbc = "git rebase --continue"; grbc = "git rebase --continue";
@ -82,11 +84,27 @@
}; };
extraConfig = { extraConfig = {
init.defaultBranch = "master"; init.defaultBranch = "master";
commit.verbose = true;
log.date = "iso";
diff.algorithm = "histogram";
diff.colorMoved = "default";
pull.rebase = true;
push.autoSetupRemote = true; push.autoSetupRemote = true;
core.sshCommand = "ssh -i ~/.ssh/id"; merge.conflictStyle = "zdiff3";
rebase.autoSquash = true;
rebase.autoStash = true;
# https://bernsteinbear.com/git
alias.recent = "! git branch --sort=-committerdate --format=\"%(committerdate:relative)%09%(refname:short)\" | head -10";
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 {
@ -99,4 +117,5 @@
(systemPackages (with pkgs; [ (systemPackages (with pkgs; [
git-absorb git-absorb
tig
])) ]))