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

2013-01-27 Thread Junio C Hamano
David Aguilar 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) ./cmd-lis

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

2013-01-27 Thread John Keeping
On Sun, Jan 27, 2013 at 01:24:46PM -0800, David Aguilar wrote: > --- a/git-mergetool--lib.sh > +++ b/git-mergetool--lib.sh > @@ -1,5 +1,6 @@ > #!/bin/sh > # git-mergetool--lib is a library for common merge tool functions > +test -z "$MERGE_TOOLS_DIR" && > MERGE_TOOLS_DIR=$(git --exec-path)/merge

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

2013-01-27 Thread Junio C Hamano
David Aguilar 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 'MERGE_TOOLS_DIR=../merget

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

2013-01-27 Thread David Aguilar
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 --- Documentation/.gitignore | 1 + Documentation/Makefile