From 43f85cf2c002ccac66c658589fa5b7243ed78c6d Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Fri, 23 Aug 2024 12:58:11 +0100
Subject: [PATCH] git: rebase on pull by default

---
 home/git.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/home/git.nix b/home/git.nix
index c73f24e..2101e64 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -6,12 +6,9 @@
     userName = "Katherina Walshe-Grey";
     userEmail = "git@qenya.tel";
     extraConfig = {
-      init = {
-        defaultBranch = "main";
-      };
-      push = {
-        autoSetupRemote = true;
-      };
+      init.defaultBranch = "main";
+      pull.rebase = true;
+      push.autoSetupRemote = true;
     };
   };
 }