From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 13:58:08 +0000 (+0900)
Subject: Merge branch 'uk/merge-subtree-doc-update' into maint
X-Git-Tag: v2.19.2~4
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=227124b27178dca25a64d6e9d1f1d9eaf27f34de

Merge branch 'uk/merge-subtree-doc-update' into maint

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

227124b27178dca25a64d6e9d1f1d9eaf27f34de