diff --git a/home/.gitconfig b/home/.gitconfig
index d127cf0..d14c7d2 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -35,3 +35,6 @@
 
 [push]
 	default = upstream
+
+[merge]
+    defaultToUpstream = true