diff --git a/.gitconfig b/.gitconfig
index 7db7311..3865161 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,8 +17,12 @@ showUntrackedFiles = all
 default            = simple
 [pull]
 rebase             = true
+autostash          = true
 [merge]
 conflictStyle      = diff3
+autostash          = true
+[rebase]
+autostash          = true
 [diff]
 renames            = true
 [fetch]