From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Jul 2012 19:56:49 +0000 (-0700)
Subject: Merge git://bogomips.org/git-svn
X-Git-Tag: v1.7.12-rc0~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8eda03a735ad62417cacec1b295628270aaf8e7d;p=git.git

Merge git://bogomips.org/git-svn

* git://bogomips.org/git-svn:
  git-svn: don't create master if another head exists
---

8eda03a735ad62417cacec1b295628270aaf8e7d