tree aeb570c94752576e9119d471bec0ee35379b5575
parent 196afc439c0eb4070ab6fe89b7d11748370dbffa
parent 5e495f81229d97f5585e06d0d45a39c5f407d026
author Junio C Hamano <gitster@pobox.com> 1542808688 +0900
committer Junio C Hamano <gitster@pobox.com> 1542808688 +0900

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