diff --git a/gitconfig/gitconfig b/gitconfig/gitconfig
index a1211d6..4f0b703 100644
--- a/gitconfig/gitconfig
+++ b/gitconfig/gitconfig
@@ -33,3 +33,7 @@ email = github@murgi.de
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+[rebase]
+	autoStash = true
+[pull]
+	rebase = true