undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'uk/merge-subtree-doc-update' into maint

Browse Source 
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
This commit is contained in:
Junio C Hamano 2018-11-21 22:58:08 +09:00
commit 227124b271
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/howto/using-merge-subtree.txt
View File

@ -33,7 +33,7 @@ Here is the command sequence you need:
---------------- ----------------
$ git remote add -f Bproject /path/to/B <1> $ 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 read-tree --prefix=dir-B/ -u Bproject/master <3>
$ git commit -m "Merge B project as our subdirectory" <4> $ git commit -m "Merge B project as our subdirectory" <4>