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 <uwe@kleine-koenig.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Uwe Kleine-König committed
Oct 24, 2018 at 10:04 UTC
5e495f81229d97f5585e06d0d45a39c5f407d026
1 file changed
+1
-1
Documentation/howto/using-merge-subtree.txt
+1
-1
@@ -33,7 +33,7 @@ Here is the command sequence you need:
33
34
----------------
35
$ git remote add -f Bproject /path/to/B <1>
36
-$ git merge -s ours --no-commit Bproject/master <2>
36
+$ git merge -s ours --no-commit --allow-unrelated-histories Bproject/master <2>
37
$ git read-tree --prefix=dir-B/ -u Bproject/master <3>
38
$ git commit -m "Merge B project as our subdirectory" <4>
39