From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Oct 2018 06:43:49 +0000 (+0900)
Subject: Merge branch 'uk/merge-subtree-doc-update'
X-Git-Tag: v2.20.0-rc0~98
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5d8b3e5d8b5e11e4c931c29e27d835449eae56af

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

5d8b3e5d8b5e11e4c931c29e27d835449eae56af