From e6f87805c7e55f2edd934dadf8bfd2ff32438bdf Mon Sep 17 00:00:00 2001
From: Felix Nehrke <felix@nehrke.info>
Date: Mon, 6 Jan 2025 15:21:12 +0100
Subject: [PATCH] Apply git autoStash not only on merge but also on rebase

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

diff --git a/.config/git/config b/.config/git/config
index 28de9aa..ce37999 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -19,6 +19,9 @@
 [mergetool]
 	# I don't need the backups of a merge
 	keepBackup = false
+[rebase]
+	# stash changes before merging remote changes this is very handy in conjunction with "pull.rebase=true"
+	autoStash = true
 [merge]
 	# stash changes before merging remote changes this is very handy in conjunction with "pull.rebase=true"
 	autoStash = true