From f34a9389682ad9e7793c10dc8ac94a6b4a3c72f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 24 Nov 2020 08:49:21 +0100
Subject: [PATCH] feat(git): auto stash on merge and rebase

---
 configs/git.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/git.nix b/configs/git.nix
index da62f9e..fe75cd8 100644
--- a/configs/git.nix
+++ b/configs/git.nix
@@ -76,6 +76,8 @@ in
       ignores = ignorePaths;
       extraConfig = {
         pull.ff = "only";
+        rebase.autoStash = true;
+        merge.autoStash = true;
         core.pager =
           "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | ${pkgs.less}/bin/less --tabs=4 -RFX";
         color = {