jolheiser
/
dotnix
mirror of https://git.jolheiser.com/dotnix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: update git config 

Signed-off-by: jolheiser <john.olheiser@gmail.com>
teamcity
jolheiser 2024-02-17 16:29:14 -06:00
parent 7705d8be72
commit 062300c001
Signed by: jolheiser
GPG Key ID: B853ADA5DA7BBF7A
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/nogui/git.nix
View File

@ -29,10 +29,10 @@ in {
tui = "!lazygit"; tui = "!lazygit";
}; };
lfs.enable = true; lfs.enable = true;
ignores = [".idea/" "result"]; ignores = [".idea/" "result" "node_modules" "ve"];
extraConfig = { extraConfig = {
init.defaultBranch = "main"; init.defaultBranch = "main";
merge.conflictstyle = "diff3"; merge.conflictstyle = "zdiff3";
diff.colorMoved = "default"; diff.colorMoved = "default";
core.editor = "hx"; core.editor = "hx";
push = { push = {
@ -40,7 +40,10 @@ in {
default = "current"; default = "current";
gpgSign = "if-asked"; gpgSign = "if-asked";
}; };
rerere.enabled = true;
pull.rebase = true; pull.rebase = true;
diff.algorithm = "histogram";
merge.tool = "hx";
url = url =
{ {
"ugit@git.jolheiser.com:".insteadOf = "ssh:jo:"; "ugit@git.jolheiser.com:".insteadOf = "ssh:jo:";