commit 73d4d5c1c2840dfaba5a45c267a6006369635bcf
author Skyler Grey <skyler3665@gmail.com> Sat Jul 30 10:54:41 2022 +0100
committer Skyler Grey <skyler3665@gmail.com> Sat Jul 30 10:54:41 2022 +0100
tree 21aa1ed02f93458e386df51b3caf414b5327db1f
parent ffe2900a77103b8663cb21d96b1a9cea4252ab83

Automatically rebase on pull

src/apps/personal/git.nix

diff --git a/src/apps/personal/git.nix b/src/apps/personal/git.nix
index 571fec8..6333d87 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 = false;
+            pull.rebase = "preserve";
             credential.helper = "store";
             commit.signOff = true;
         };