diff options
| author | Uwe Kleine-König <uwe@kleine-koenig.org> | 2018-10-24 08:04:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-25 05:45:15 (GMT) |
| commit | 5e495f81229d97f5585e06d0d45a39c5f407d026 (patch) | |
| tree | c8fb948807d5daf692b71b1094ab9d50d16dbe04 /Documentation/howto | |
| parent | cae598d9980661a978e2df4fb338518f7bf09572 (diff) | |
| download | git-5e495f81229d97f5585e06d0d45a39c5f407d026.zip git-5e495f81229d97f5585e06d0d45a39c5f407d026.tar.gz git-5e495f81229d97f5585e06d0d45a39c5f407d026.tar.bz2 | |
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>
Diffstat (limited to 'Documentation/howto')
| -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> |