Merge branch 'aw/contrib-subtree-doc-asciidoctor'
commit33cc9cfc3d0e55539a88b3ed90d310845d652197
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Jul 2017 01:14:42 +0000 (6 18:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Jul 2017 01:14:42 +0000 (6 18:14 -0700)
tree72350976c605b22c30bcae64776dc83a178d735f
parent50ff9ea4a0770c8b1bfe3f98f09728427c0c6cc7
parentfdc1ad97c1fc31cb276a37c2e63ed88716b76269
Merge branch 'aw/contrib-subtree-doc-asciidoctor'

The Makefile rule in contrib/subtree for building documentation
learned to honour USE_ASCIIDOCTOR just like the main documentation
set does.

* aw/contrib-subtree-doc-asciidoctor:
  subtree: honour USE_ASCIIDOCTOR when set