git: merge from upstream by default