| commit | 366d2d5f485c7d0b288520c4f7249e0380c5a9b3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Aug 2016 18:55:26 +0000 (10 11:55 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Aug 2016 18:55:26 +0000 (10 11:55 -0700) | ||
| tree | a89ef42b997844230789f644079c8d6ff9ff824a | treesnapshot (tar.gz zip) |
| parent | d9d7ab3b1d5a1d1e24b2249e612bab41819b6188 | commitdiff |
| parent | 0f12c7d4d175bb0566208213b1b340b6794f305c | commitdiff |
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
"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