summaryrefslogtreecommitdiff
path: root/ident.c
diff options
context:
space:
mode:
authorLibravatar Uwe Kleine-König <uwe@kleine-koenig.org>2018-10-24 10:04:52 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-25 14:45:15 +0900
commit5e495f81229d97f5585e06d0d45a39c5f407d026 (patch)
treec8fb948807d5daf692b71b1094ab9d50d16dbe04 /ident.c
parentGit 2.19.1 (diff)
downloadtgif-5e495f81229d97f5585e06d0d45a39c5f407d026.tar.xz
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 'ident.c')
0 files changed, 0 insertions, 0 deletions