[PATCH 4/4] doc: Generate a list of valid merge tools

Use the new filter_tools() function to build lists of all the built-in tools supported by difftool and mergetool. This frees us from needing to update the documentation whenever a new tool is added. Signed-off-by: David Aguilar dav...@gmail.com --- Documentation/.gitignore | 1 +

Re: [PATCH 4/4] doc: Generate a list of valid merge tools

David Aguilar dav...@gmail.com writes: +mergetools_txt = mergetools-diff.txt mergetools-merge.txt + +$(mergetools_txt): mergetools-list.made + +mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*) + $(QUIET_GEN)$(RM) $@ \ + $(SHELL_PATH) -c

Re: [PATCH 4/4] doc: Generate a list of valid merge tools

David Aguilar dav...@gmail.com writes: diff --git a/Documentation/Makefile b/Documentation/Makefile index 267dfe1..f595d26 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -226,13 +226,27 @@ cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT) $(PERL_PATH)