Home

dotnix @main - refs - log -
- 
https://git.jolheiser.com/dotnix.git
My nix dotfiles
tree log patch
chore: update git config Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmXRMzoACgkQuFOtpdp7 v3pIzw//TIL16qLVKDF/y4gZURCiemywKmHLtV1IZPeiMTHMP+oMF2hqwfShurIS bNXEkJ0AUQOJnoQJAAvhhxSshtBSiCP6+OBKWA46zxqOrfsHEyqqdWN/N/M+6wv9 I7fxz7hy2MgBxCoIPlYWTzFNsoXbVxvcc/HqsH6heWTdT5a2+Zd7Z+dukMLFYdgm ou+FbqstTVrOGjRPF1nnyxCerygAf1NxBjLvowENc346Z+wMTbQetZIIzgI+5UQZ MWoesRhAPPobcZD+amMZeT4HG1+3MnyYokkx5LZuAcFWZnjDKDbGnaHBji2bea01 IcpBrjeygrFQgyUdpKfAlHQeuUM2Js4skahlZHsHpviXdrmByCsOsFbCBupk6Lya 3PLOb72B7v35qRKulbEW2u/I5BBzzlDgIDgrGlR+Fp09BDFc8J5Oi++UuPMLCQbt 81o08Au0STNBugZ6T6F+vJBOyZWA8JDs6HXuNdB3lX//rzEab0uhO/IJi/Zuof60 854GYvExXbCXDTSj12lZMvDMuW5lPKc3tmboEufTut5YyQ8vYqwLuQePg+lvro3e n8uPKSO/S71VsJz9lYxmEOQGrS6Wn09LGpYxfaoL7YorNQA605HsTiO7THXmJMio FCtH7UcYRjp1kzpwtY4i5PG4AaK4TJlS0hIGYZkQPamvxeRR1G0= =Qw35 -----END PGP SIGNATURE-----
jolheiser <john.olheiser@gmail.com>
1 year ago
1 changed files, 5 additions(+), 2 deletions(-)
apps/nogui/git.nix
M apps/nogui/git.nix → apps/nogui/git.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28

diff --git a/apps/nogui/git.nix b/apps/nogui/git.nix
index b93bedaa3c105994f37450f41a7c16ba7facd47d..5361e3c6febcfb6abc2ad5ac52ed61ea81bc3af6 100644
--- a/apps/nogui/git.nix
+++ b/apps/nogui/git.nix
@@ -29,10 +29,10 @@       last = "log --show-signature --format=fuller --max-count=1 HEAD";
       tui = "!lazygit";
     };
     lfs.enable = true;
-    ignores = [".idea/" "result"];
+    ignores = [".idea/" "result" "node_modules" "ve"];
     extraConfig = {
       init.defaultBranch = "main";
-      merge.conflictstyle = "diff3";
+      merge.conflictstyle = "zdiff3";
       diff.colorMoved = "default";
       core.editor = "hx";
       push = {
@@ -40,7 +40,10 @@         sutoSetupRemote = true;
         default = "current";
         gpgSign = "if-asked";
       };
+      rerere.enabled = true;
       pull.rebase = true;
+      diff.algorithm = "histogram";
+      merge.tool = "hx";
       url =
         {
           "ugit@git.jolheiser.com:".insteadOf = "ssh:jo:";