diff --git a/home-modules/xun/develop/default.nix b/home-modules/xun/develop/default.nix
index 3e16c7b..6b7c3cb 100644
--- a/home-modules/xun/develop/default.nix
+++ b/home-modules/xun/develop/default.nix
@@ -49,6 +49,8 @@ in {
           extraConfig = {
             gpg.format = "ssh";
             push.autoSetupRemote = true;
+            pull.rebase = true;
+            rebase.autostash = true;
           };
 
           userEmail = "xunuwu@gmail.com";