moritz
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🚀 use diff3 by default

nixos
Moritz Böhme 2022-08-20 14:20:30 +02:00
parent 4b71dc1ced
commit bb9ef66f98
Signed by: moritz
GPG Key ID: 970C6E89EB0547A9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/programs/git.nix
View File

@ -40,7 +40,10 @@ in
enable = true; enable = true;
userName = "Moritz Böhme"; userName = "Moritz Böhme";
userEmail = "mail@moritzboeh.me"; userEmail = "mail@moritzboeh.me";
extraConfig.init.defaultBranch = "main"; extraConfig = {
init.defaultBranch = "main";
merge.conflictstyle = "diff3";
};
delta.enable = true; delta.enable = true;
signing = mkIf cfg.signing { signing = mkIf cfg.signing {
key = "0x970C6E89EB0547A9"; key = "0x970C6E89EB0547A9";