From a07357a1960d36160104039532d097067360c42b Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Mon, 9 Sep 2024 12:10:46 +0200
Subject: [PATCH] git pull default to rebase

---
 home-modules/xun/develop/default.nix | 2 ++
 1 file changed, 2 insertions(+)

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";