summaryrefslogtreecommitdiff
path: root/Documentation/howto
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-30 06:43:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-30 06:43:49 (GMT)
commit5d8b3e5d8b5e11e4c931c29e27d835449eae56af (patch)
treed474c5b8915ebb4ad8ac57323b8c7a2b478d9d26 /Documentation/howto
parenta70d7827ac071b9e4242ae7d145ce27013d8b928 (diff)
parent5e495f81229d97f5585e06d0d45a39c5f407d026 (diff)
downloadgit-5d8b3e5d8b5e11e4c931c29e27d835449eae56af.zip
git-5d8b3e5d8b5e11e4c931c29e27d835449eae56af.tar.gz
git-5d8b3e5d8b5e11e4c931c29e27d835449eae56af.tar.bz2
Merge branch 'uk/merge-subtree-doc-update'
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
Diffstat (limited to 'Documentation/howto')
-rw-r--r--Documentation/howto/using-merge-subtree.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt
index 1ae8d12..a499a94 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>