diff --git a/.gitconfig b/.gitconfig
index 4154c72..4eaba0f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,6 +14,9 @@
 	whitespace = trailing-space space-before-tab
 [push]
 	default = simple
+[pull]
+	rebase = true
+	ff = only
 [alias]
 	st = status -s -b