From ac4ec38f44387963862a40db6b9fe212f10c0f82 Mon Sep 17 00:00:00 2001
From: Reiner Herrmann <reiner@reiner-h.de>
Date: Mon, 3 Oct 2022 01:43:06 +0200
Subject: git: enable autostashing for merges

---
 git/gitconfig | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'git')

diff --git a/git/gitconfig b/git/gitconfig
index 97d9b5e..b33252e 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -43,3 +43,6 @@
 
 [column]
 	branch = auto
+
+[merge]
+	autoStash = true
-- 
cgit v1.2.3