From: Uwe Kleine-König Date: Wed, 24 Oct 2018 08:04:52 +0000 (+0200) Subject: howto/using-merge-subtree: mention --allow-unrelated-histories X-Git-Tag: v2.19.2~4^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5e495f81229d97f5585e06d0d45a39c5f407d026 howto/using-merge-subtree: mention --allow-unrelated-histories Without passing --allow-unrelated-histories the command sequence fails as intended since commit e379fdf34fee ("merge: refuse to create too cool a merge by default"). To setup a subtree merging unrelated histories is normal, so add the option to the howto document. Signed-off-by: Uwe Kleine-König Signed-off-by: Junio C Hamano --- diff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt index 1ae8d1214e..a499a94ac2 100644 --- a/Documentation/howto/using-merge-subtree.txt +++ b/Documentation/howto/using-merge-subtree.txt @@ -33,7 +33,7 @@ Here is the command sequence you need: ---------------- $ git remote add -f Bproject /path/to/B <1> -$ git merge -s ours --no-commit Bproject/master <2> +$ git merge -s ours --no-commit --allow-unrelated-histories Bproject/master <2> $ git read-tree --prefix=dir-B/ -u Bproject/master <3> $ git commit -m "Merge B project as our subdirectory" <4>