gwg313/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: update merge section in git config

Browse source
This commit is contained in:
Glen Goodwin 2023-11-10 00:11:11 -05:00
parent 6e84ea98e4
commit 9784f4bd54
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/shell/git/home.nix
View file

@ -10,9 +10,6 @@
userName = "Glen Goodwin"; userName = "Glen Goodwin";
userEmail = "glen.goodwin1992@gmail.com"; userEmail = "glen.goodwin1992@gmail.com";
extraConfig = { extraConfig = {
merge = {
ff = "only";
};
diff = { diff = {
algorithm = "patience"; algorithm = "patience";
compactionHeuristic = "true"; compactionHeuristic = "true";