diff --git a/.config/git/config b/.config/git/config
index 387b9ed..fb4e8f6 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -24,3 +24,7 @@
 	autostash = true
 [include]
 	path = user.config
+[pull]
+	rebase = true
+[merge]
+	log = true