From: Brett Cundal Date: Thu, 21 Jul 2016 00:56:51 GMT Subject: [PATCH] git-subtree.sh: Use --allow-unrelated-histories when splitting with --rejoin Message-ID: <010201560af48050-012ea887-a1e1-4d1b-82d3-4799ac7788bc-000000@eu-west-1.amazonses.com> --- contrib/subtree/git-subtree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 7a39b30..556cd92 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -661,7 +661,7 @@ cmd_split() if [ -n "$rejoin" ]; then debug "Merging split branch into HEAD..." latest_old=$(cache_get latest_old) - git merge -s ours \ + git merge -s ours --allow-unrelated-histories \ -m "$(rejoin_msg "$dir" $latest_old $latest_new)" \ $latest_new >&2 || exit $? fi -- https://github.com/git/git/pull/274