From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Jul 2017 01:14:42 +0000 (-0700)
Subject: Merge branch 'aw/contrib-subtree-doc-asciidoctor'
X-Git-Tag: v2.14.0-rc0~33
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/33cc9cfc3d0e55539a88b3ed90d310845d652197?ds=inline;hp=--cc

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
---

33cc9cfc3d0e55539a88b3ed90d310845d652197