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;
     };
   };
 }