From f5bd49f17262eed1cb27d9bd117baeaa6a247071 Mon Sep 17 00:00:00 2001
From: John Bowdre <john@bowdre.net>
Date: Sun, 23 Jul 2023 21:17:52 -0500
Subject: [PATCH] git config tweak

---
 nix/common/home.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/common/home.nix b/nix/common/home.nix
index 2e81baf..009b85d 100644
--- a/nix/common/home.nix
+++ b/nix/common/home.nix
@@ -74,7 +74,7 @@
     userName = "John Bowdre";
     extraConfig = {
       init.defaultBranch = "main";
-      pull.ff = "only";
+      pull.rebase = false;
     };
   };
 }