From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Apr 2019 10:28:09 +0000 (+0900)
Subject: Merge branch 'ma/doc-diff-doc-vs-doctor-comparison'
X-Git-Tag: v2.22.0-rc0~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08c9757a76eaeae1a600b98932e65bd339a73e25;p=thirdparty%2Fgit.git

Merge branch 'ma/doc-diff-doc-vs-doctor-comparison'

Dev support update to make it easier to compare two formatted
results from our documentation.

* ma/doc-diff-doc-vs-doctor-comparison:
  doc-diff: add `--cut-header-footer`
  doc-diff: support diffing from/to AsciiDoc(tor)
  doc-diff: let `render_tree()` take an explicit directory name
  Doc: auto-detect changed build flags
---

08c9757a76eaeae1a600b98932e65bd339a73e25
diff --cc Documentation/Makefile
index ccac771d3f,b534623012..4e4dd7ecf1
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -340,13 -349,14 +349,14 @@@ clean
  	$(RM) SubmittingPatches.txt
  	$(RM) $(cmds_txt) $(mergetools_txt) *.made
  	$(RM) manpage-base-url.xsl
+ 	$(RM) GIT-ASCIIDOCFLAGS
  
- $(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb
 -$(MAN_HTML): %.html : %.txt asciidoc.conf GIT-ASCIIDOCFLAGS
++$(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
  	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
  	$(TXT_TO_HTML) -d manpage -o $@+ $< && \
  	mv $@+ $@
  
- $(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb
 -$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf GIT-ASCIIDOCFLAGS
++$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
  	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
  	$(TXT_TO_HTML) -o $@+ $< && \
  	mv $@+ $@
@@@ -358,12 -368,12 +368,12 @@@ manpage-base-url.xsl: manpage-base-url.
  	$(QUIET_XMLTO)$(RM) $@ && \
  	$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
  
- %.xml : %.txt asciidoc.conf asciidoctor-extensions.rb
 -%.xml : %.txt asciidoc.conf GIT-ASCIIDOCFLAGS
++%.xml : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
  	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
  	$(TXT_TO_XML) -d manpage -o $@+ $< && \
  	mv $@+ $@
  
- user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb
 -user-manual.xml: user-manual.txt user-manual.conf GIT-ASCIIDOCFLAGS
++user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
  	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
  	$(TXT_TO_XML) -d book -o $@+ $< && \
  	mv $@+ $@