tree c8fb948807d5daf692b71b1094ab9d50d16dbe04
parent cae598d9980661a978e2df4fb338518f7bf09572
author Uwe Kleine-König <uwe@kleine-koenig.org> 1540368292 +0200
committer Junio C Hamano <gitster@pobox.com> 1540446315 +0900

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>