diff --git a/home/yt/common.nix b/home/yt/common.nix
index b3146f3..bf780c3 100644
--- a/home/yt/common.nix
+++ b/home/yt/common.nix
@@ -34,9 +34,9 @@
     userEmail = "hi@cything.io";
     delta.enable = true;
     extraConfig = {
-      init = {
-        "defaultBranch" = "main";
-      };
+      init.defaultBranch = "main";
+      push.autoSetupRemote = true; # assume -u on first push
+      pull.ff = "only";
     };
   };
   programs.ripgrep.enable = true;