pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Switch back to git pull.rebase = false by default

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-12-19 14:46:38 +00:00
parent acbfe003cc
commit 6939b7f468
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home/default.nix
View file

@ -126,7 +126,7 @@
}; };
extraConfig = { extraConfig = {
github.user = "elitherl"; github.user = "elitherl";
pull.rebase = true; pull.rebase = false;
init.defaultBranch = "main"; init.defaultBranch = "main";
merge.conflictstyle = "diff3"; merge.conflictstyle = "diff3";
diff.colorMoved = "default"; diff.colorMoved = "default";