Merge branch 'uk/merge-subtree-doc-update'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Oct 2018 06:43:49 +0000 (15:43 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Oct 2018 06:43:49 +0000 (15:43 +0900)
commit5d8b3e5d8b5e11e4c931c29e27d835449eae56af
treed474c5b8915ebb4ad8ac57323b8c7a2b478d9d26
parenta70d7827ac071b9e4242ae7d145ce27013d8b928
parent5e495f81229d97f5585e06d0d45a39c5f407d026
Merge branch 'uk/merge-subtree-doc-update'

Belated documentation update to adjust to a new world order that
happened a yew years ago.

* uk/merge-subtree-doc-update:
  howto/using-merge-subtree: mention --allow-unrelated-histories