diff --git a/users/profiles/git/default.nix b/users/profiles/git/default.nix
index 40b4e5d..39c9c93 100644
--- a/users/profiles/git/default.nix
+++ b/users/profiles/git/default.nix
@@ -3,8 +3,8 @@
     enable = true;
 
     extraConfig = {
-      pull.rebase = false;
-      init.defaultBranch = "main";
+      init.defaultBranch = "mistress";
+      pull.ff = "only";
     };
     userEmail = "badatnames@tutanota.com";
     userName = "bad";