Set merge.defaultToUpstream to true

2016-01-14 18:35:40 +00:00 · 2016-01-14 18:35:40 +00:00 · bbeb4854b9
parent 9298d7ddad
commit bbeb4854b9
1 changed files with 3 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -144,3 +144,6 @@

 [pull]
  rebase = true
+
+[merge]
+  defaultToUpstream = true