From d545ebde29f0b2f1c934c25906dc0bd2bc237d97 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Sat, 8 Apr 2023 20:01:43 +0200
Subject: [PATCH] Autostash on git pull

---
 home/programs/git.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 = {