gitconfig: merge: defaultToUpstream

gitconfig

@@ -34,5 +34,8 @@
 	editor = vim
 	pager = less -FXRS -x4
 
+[merge]
+	defaultToUpstream = true
+
 [alias]
 	short = log --graph --pretty=format:'%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --patience