Add merge.defaultToUpstream = true

ithinkihaveacat · Dec 5, 2012 · c58b536 · c58b536
1 parent 338df19
commit c58b536
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/home/.gitconfig b/home/.gitconfig
@@ -35,3 +35,6 @@
 
 [push]
 	default = upstream
+
+[merge]
+    defaultToUpstream = true