Add merge.defaultToUpstream=true to make fetch/merge easier.