Re: [PATCH] howto/using-merge-subtree: mention --allow-unrelated-histories

2018-10-24 Thread Junio C Hamano
Uwe Kleine-König writes: > 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

[PATCH] howto/using-merge-subtree: mention --allow-unrelated-histories

2018-10-24 Thread Uwe Kleine-König
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