diff --git a/home/programs/git.nix b/home/programs/git.nix
index 1b5bbac..0694afc 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -113,13 +113,21 @@
       autocorrect = 1;
     };
 
+    init = {
+      defaultBranch = "main";
+    };
+
     push = {
       default = "current";
       gpgSign = "if-asked";
     };
 
-    init = {
-      defaultBranch = "main";
+    pull = {
+      rebase = true;
+    };
+
+    rebase = {
+      autoStash = true;
     };
 
     merge = {