diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:26 -0700 |
| commit | 366d2d5f485c7d0b288520c4f7249e0380c5a9b3 (patch) | |
| tree | a89ef42b997844230789f644079c8d6ff9ff824a /builtin/merge-file.c | |
| parent | d9d7ab3b1d5a1d1e24b2249e612bab41819b6188 (diff) | |
| parent | 0f12c7d4d175bb0566208213b1b340b6794f305c (diff) | |
| download | git-366d2d5f485c7d0b288520c4f7249e0380c5a9b3.tar.gz git-366d2d5f485c7d0b288520c4f7249e0380c5a9b3.tar.xz | |
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
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions