dotnix @main -
refs -
log -
-
https://git.jolheiser.com/dotnix.git
Signature
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmUMcQAACgkQuFOtpdp7
v3pnoBAAsWTXxXSy82dVzRPookTSJJJfSwo0+b9g5hEJHuFhumK0rIRR73hVI/n0
R0BbJBFJMh3P8B4whZMHZrViEugxRAop4ppxMAc18E0e8Brl6m8Ng0Fb13kUZy8/
SoxyaJZlqOZVXvFuPa0LTYrVlfCE5R+EnGqHMILyPoeUK0AcA0+KwZn2KQzOjsLY
NA+cpZoY4Fw3uctVoL72fIkeaTs8WoJCEqYsGOwG5e5H3Ccws56ofmU0uKYoB4Nw
u6tHq0TgbdvOYAJQ7D2KuT25aJsLDFBeugpngQTYflYZy3p384vEUvFa4/7WPoZd
YXUaGZYrOptEqIf3JsusEXWAKQb3BsOSQimM8bIx64k8s3kSTzcmbxxiAa6hog91
9Mp9Q4EIdItA06SKkOcvwgIk3kms1H2Xb5PQQe+P8qrsJICgaWBnwt2yYPdtAvW3
QrE/1s6DLb7PO0nuxXmvokHGdnxp0ig96U803DHscPTe3NDjgAa6UmEVoNfdqJDJ
/3DkQ1rw+x31xsGl0QhJzo8f03MuhvNy4WFAZtFIv4vbeKCq0bt+LDdSupIJnaV6
ee6H8t3RlQhAL7zlRjF5gDSFl+qlh7EYqm8s/WNAkGk0BjVL9H2hl383/1+h7icG
5LSzhPIx9F/C1WHD01NWsot83ndzl6kZ+5Rgyge8cvhcW7wEpfo=
=Czug
-----END PGP SIGNATURE-----
diff --git a/apps/nogui/git.nix b/apps/nogui/git.nix
index d46f6dbaf954833339cdf6d93221ce9d285e344e..a2580948c8bf31423df8090f599ba6946b10177c 100644
--- a/apps/nogui/git.nix
+++ b/apps/nogui/git.nix
@@ -28,7 +28,7 @@ unstage = "restore --staged";
tui = "!lazygit";
};
lfs.enable = true;
- ignores = [".idea/"];
+ ignores = [".idea/" "result"];
extraConfig = {
init.defaultBranch = "main";
merge.conflictstyle = "diff3";