From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Aug 2016 18:55:26 +0000 (-0700)
Subject: Merge branch 'da/subtree-2.9-regression' into maint
X-Git-Tag: v2.9.3~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/366d2d5f485c7d0b288520c4f7249e0380c5a9b3

Merge branch 'da/subtree-2.9-regression' into maint

"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
---

366d2d5f485c7d0b288520c4f7249e0380c5a9b3