From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Dec 2011 23:24:12 +0000 (-0800)
Subject: Merge branch 'vr/git-merge-default-to-upstream'
X-Git-Tag: v1.7.9-rc0~93
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ce8781e8ab66fb90fb7baf8d953a4582a06571a7;p=git.git

Merge branch 'vr/git-merge-default-to-upstream'

* vr/git-merge-default-to-upstream:
  Show error for 'git merge' with unset merge.defaultToUpstream
---

ce8781e8ab66fb90fb7baf8d953a4582a06571a7