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)
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


Trivial merge