From a71d5eb6a26a8af1fb80b706810649ba85ca6aab Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Tue, 4 Apr 2023 18:30:00 +0100
Subject: [PATCH] Set default scheme for git diverged branches

---
 nixos/home-manager/packages/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/home-manager/packages/default.nix b/nixos/home-manager/packages/default.nix
index 6ce5fcb1..5e83222f 100644
--- a/nixos/home-manager/packages/default.nix
+++ b/nixos/home-manager/packages/default.nix
@@ -33,6 +33,12 @@
   programs.git = {
     enable = true;
     userName = "Evie Litherland-Smith";
+    delta.enable = true;
+    extraConfig = {
+      pull = {
+        rebase = false;
+      };
+    };
   };
   programs.starship = {
     enable = true;