From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Apr 2016 19:59:08 +0000 (-0700)
Subject: Merge branch 'jc/merge-refuse-new-root'
X-Git-Tag: v2.9.0-rc0~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=175008d45474ff78ca9e3dcf038df359a97b4d92;p=thirdparty%2Fgit.git

Merge branch 'jc/merge-refuse-new-root'

"git pull" has been taught to pass --allow-unrelated-histories
option to underlying "git merge".

* jc/merge-refuse-new-root:
  pull: pass --allow-unrelated-histories to "git merge"
  t3033: avoid 'ambiguous refs' warning
---

175008d45474ff78ca9e3dcf038df359a97b4d92