From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Jun 2014 19:06:43 +0000 (-0700)
Subject: Merge branch 'fc/merge-default-to-upstream'
X-Git-Tag: v2.1.0-rc0~194
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b8ef69fe2e837d78250555807073b5405f7c9297

Merge branch 'fc/merge-default-to-upstream'

"git merge" without argument, even when there is an upstream
defined for the current branch, refused to run until
merge.defaultToUpstream is set to true. Flip the default of that
configuration variable to true.

* fc/merge-default-to-upstream:
merge: enable defaulttoupstream by default
---

b8ef69fe2e837d78250555807073b5405f7c9297