Merge branch 'aw/contrib-subtree-doc-asciidoctor' into maint
commit35049a2343948f686861e176a8c395f9f67da7b6
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:59:06 +0000 (10 13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:59:06 +0000 (10 13:59 -0700)
tree9cf94ebe5e1fa8417237ab6c83eb19983a605ec9
parenta9e87e3204280dd005bcb7d4bea6f833b27da03d
parentfdc1ad97c1fc31cb276a37c2e63ed88716b76269
Merge branch 'aw/contrib-subtree-doc-asciidoctor' into maint

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