commit 8dee1c0109ad873f3d7859922731c1324a2479ef
author Skyler Grey <skyler3665@gmail.com> Mon Aug 01 09:36:38 2022 +0100
committer Skyler Grey <skyler3665@gmail.com> Mon Aug 01 09:36:38 2022 +0100
tree 67e2676e332dbe9a4634a4e3d079c069e1df1187
parent 6d2d67aec4eadd49a93927b4a1f3e31806bbd2e6

Set pull.rebase to merges (removing superseded value)

src/apps/personal/git.nix

diff --git a/src/apps/personal/git.nix b/src/apps/personal/git.nix
index 6333d87..c729a87 100644
--- a/src/apps/personal/git.nix
+++ b/src/apps/personal/git.nix
@@ -18,7 +18,7 @@
             init.defaultBranch = "development";
             color.ui = "auto";
             core.autocrlf = "input";
-            pull.rebase = "preserve";
+            pull.rebase = "merges";
             credential.helper = "store";
             commit.signOff = true;
         };