From: Junio C Hamano Date: Wed, 21 Nov 2018 13:58:08 +0000 (+0900) Subject: Merge branch 'uk/merge-subtree-doc-update' into maint X-Git-Tag: v2.19.2~4 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/227124b27178dca25a64d6e9d1f1d9eaf27f34de?hp=196afc439c0eb4070ab6fe89b7d11748370dbffa Merge branch 'uk/merge-subtree-doc-update' into maint Belated documentation update to adjust to a new world order that happened a yew years ago. * uk/merge-subtree-doc-update: howto/using-merge-subtree: mention --allow-unrelated-histories --- 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>