W dniu 31.07.2016 o 16:32, Sylvain Garrigues pisze: > Hello, > > It seems now with 2.9 you cannot use git subtree split —rejoin > without —onto otherwise you get: > fatal: refusing to merge unrelated histories > > I wish I could pass --allow-unrelated-histories but that doesn’t > work. > > Adding —onto makes the split operation much much longer. Could we > make a bug fix which allow to pass the --allow-unrelated-histories > flag to subtree split? This should be soon in 'master', you can check it in 'next', and I think it would be present in the new release. >From "What's cooking in git.git (Jul 2016, #09; Fri, 29)": -------------------------------------------------------------------- [Cooking] * da/subtree-2.9-regression (2016-07-26) 2 commits (merged to 'next' on 2016-07-26 at 9d71562) + subtree: fix "git subtree split --rejoin" + t7900-subtree.sh: fix quoting and broken && chains (this branch is used by da/subtree-modernize.) "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. Will merge to 'master'. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html