From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Aug 2016 22:10:22 +0000 (-0700)
Subject: Merge branch 'da/subtree-2.9-regression'
X-Git-Tag: v2.10.0-rc0~68
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c0728edfb676588d9c47738889445450efea94e0

Merge branch 'da/subtree-2.9-regression'

"git merge" in Git v2.9 was taught to forbid merging an unrelated
lines of history by default, but that is exactly the kind of thing
the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
"git subtree" has been taught to use the "--allow-unrelated-histories"
option to override the default.

* da/subtree-2.9-regression:
subtree: fix "git subtree split --rejoin"
t7900-subtree.sh: fix quoting and broken && chains
---

c0728edfb676588d9c47738889445450efea94e0