Specify upstream explicity in git merge.

It worked locally because git's push.default setting was set to
'simple', but we can't rely on that. In particular, the default for
git < 2.0 is to error out if no refspec is given.