]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit227124b27178dca25a64d6e9d1f1d9eaf27f34de
treeaeb570c94752576e9119d471bec0ee35379b5575
parent196afc439c0eb4070ab6fe89b7d11748370dbffa
parent5e495f81229d97f5585e06d0d45a39c5f407d026
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