git: do rebase over ff

FredeEB · Mar 17, 2024 · bd0c6ed · bd0c6ed
1 parent b65ab26
commit bd0c6ed
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/users/bun.nix b/users/bun.nix
@@ -138,7 +138,7 @@ in {
           email = "[email protected]";
         };
         commit.verbose = true;
-        pull.ff = true;
+        pull.rebase = true;
         pull.autoSquash = true;
         pull.autoStash = true;
         push.default = "upstream";