diff --git a/playbooks/roles/git/templates/gitconfig.j2 b/playbooks/roles/git/templates/gitconfig.j2
index 696be6b..9fb16b3 100644
--- a/playbooks/roles/git/templates/gitconfig.j2
+++ b/playbooks/roles/git/templates/gitconfig.j2
@@ -23,6 +23,9 @@
 [pull]
 	rebase = true
 
+[rebase]
+	autoStash = true
+
 [user]
 	name       = Matej Focko
 	email      = {{ git_email }}