diff --git a/.gitconfig b/.gitconfig
index 33c7a304..345364fb 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -106,3 +106,6 @@
 
 [diff]
     tool = vimdiff
+
+[rebase]
+    autostash = true