gitconfig: merge.defaultToUpstream=true

diff --git a/.gitconfig b/.gitconfig
index 694d7bb396c6880c34fb2563a81007bfeffe012c..c7644b86b15a841003011eaa21e10f5e2907d3ab 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,6 +16,8 @@
        algorithm = minimal
 [push]
        default = upstream
+[merge]
+       defaultToUpstream = true
 [alias]
        graphlog = log --graph --pretty=format:'%C(bold black)%h%Creset %C(bold red)%ad %C(bold blue)%s%Creset %C(bold yellow)%d%Creset %C(bold black)<%an>%Creset' --date=short
        ci = commit