]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'uk/merge-subtree-doc-update' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:58:08 +0000 (22:58 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:58:08 +0000 (22:58 +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