wymiller/nix-config-v2
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

added git merge backup settings

Browse Source
This commit is contained in:
Wyatt J. Miller
2025-06-12 13:01:59 -04:00
parent 4afb47e881
commit 8785247675
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
home/git.nix
View File

@ -17,6 +17,7 @@
push.autoSetupRemote = true; push.autoSetupRemote = true;
pull.merge = true; pull.merge = true;
merge.tool = "nvimdiff"; merge.tool = "nvimdiff";
mergetool.keepBackup = false;
}; };
ignores = [ ignores = [