diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 13:58:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 13:58:08 (GMT) |
| commit | 227124b27178dca25a64d6e9d1f1d9eaf27f34de (patch) | |
| tree | aeb570c94752576e9119d471bec0ee35379b5575 /Documentation | |
| parent | 196afc439c0eb4070ab6fe89b7d11748370dbffa (diff) | |
| parent | 5e495f81229d97f5585e06d0d45a39c5f407d026 (diff) | |
| download | git-227124b27178dca25a64d6e9d1f1d9eaf27f34de.zip git-227124b27178dca25a64d6e9d1f1d9eaf27f34de.tar.gz git-227124b27178dca25a64d6e9d1f1d9eaf27f34de.tar.bz2 | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/howto/using-merge-subtree.txt | 2 |
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> |