diff --git a/git/gitconfig.j2 b/git/gitconfig.j2
index 1a6e291..b53fd0c 100644
--- a/git/gitconfig.j2
+++ b/git/gitconfig.j2
@@ -102,6 +102,7 @@
     program = gpg2
 [rebase]
     autoSquash = true
+    autoStash = true
 [diff]
     submodule = log
     mnemonicPrefix = true