diff --git a/.gitconfig b/.gitconfig
index fe82da7..c9f2ec9 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -144,3 +144,6 @@
 
 [pull]
   rebase = true
+
+[merge]
+  defaultToUpstream = true