From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2013 22:42:08 +0000 (-0800)
Subject: Merge branch 'da/mergetool-docs'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=39ca1bd88256ea482305b7e0acc943ef14e4b36d;p=git.git

Merge branch 'da/mergetool-docs'

Build on top of the clean-up done by jk/mergetool and automatically
generate the list of mergetool and difftool backends the build
supports to be included in the documentation.

* da/mergetool-docs:
  doc: generate a list of valid merge tools
  mergetool--lib: list user configured tools in '--tool-help'
  mergetool--lib: add functions for finding available tools
  mergetool--lib: improve the help text in guess_merge_tool()
  mergetool--lib: simplify command expressions
---

39ca1bd88256ea482305b7e0acc943ef14e4b36d
diff --cc Documentation/Makefile
index ae27aa5cd,9209cf277..62dbd9ac7
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -273,11 -249,11 +291,11 @@@ clean
  	$(RM) *.texi *.texi+ *.texi++ git.info gitman.info
  	$(RM) *.pdf
  	$(RM) howto-index.txt howto/*.html doc.dep
 -	$(RM) technical/api-*.html technical/api-index.txt
 +	$(RM) technical/*.html technical/api-index.txt
- 	$(RM) $(cmds_txt) *.made
+ 	$(RM) $(cmds_txt) $(mergetools_txt) *.made
  	$(RM) manpage-base-url.xsl
  
 -$(MAN_HTML): %.html : %.txt
 +$(MAN_HTML): %.html : %.txt asciidoc.conf
  	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
  	$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \
  		$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \