| commit | 5e495f81229d97f5585e06d0d45a39c5f407d026 | |
| author | Uwe Kleine-König <uwe@kleine-koenig.org> | |
| Wed, 24 Oct 2018 08:04:52 +0000 (24 10:04 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Oct 2018 05:45:15 +0000 (25 14:45 +0900) | ||
| tree | c8fb948807d5daf692b71b1094ab9d50d16dbe04 | treesnapshot (tar.gz zip) |
| parent | cae598d9980661a978e2df4fb338518f7bf09572 | commitdiff |
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>
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>
| Documentation/howto/using-merge-subtree.txt | diffblobblamehistory |