git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cae598d)
howto/using-merge-subtree: mention --allow-unrelated-histories
authorUwe Kleine-König <redacted>
Wed, 24 Oct 2018 08:04:52 +0000 (10:04 +0200)
committerJunio C Hamano <redacted>
Thu, 25 Oct 2018 05:45:15 +0000 (14:45 +0900)
commit5e495f81229d97f5585e06d0d45a39c5f407d026
treec8fb948807d5daf692b71b1094ab9d50d16dbe04tree | snapshot
parentcae598d9980661a978e2df4fb338518f7bf09572commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/howto/using-merge-subtree.txt diff | blob | history
git clone https://git.99rst.org/PROJECT