From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jul 2017 20:59:06 +0000 (-0700)
Subject: Merge branch 'aw/contrib-subtree-doc-asciidoctor' into maint
X-Git-Tag: v2.13.3~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/35049a2343948f686861e176a8c395f9f67da7b6?hp=-c

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

35049a2343948f686861e176a8c395f9f67da7b6