diff --git a/programs/git.nix b/programs/git.nix
index 646e070..1b4d44d 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -41,6 +41,10 @@ _: {
         push = {
           autoSetupRemote = true;
         };
+
+        pull = {
+          ff = "only";
+        };
       };
     };
   };