From: David Aguilar Date: Sun, 27 Jan 2013 21:24:42 GMT Subject: [PATCH 0/4] Documentation: Auto-generate merge tool lists Message-ID: <1359321886-80523-1-git-send-email-davvid@gmail.com> Refactor the mergetool-lib so that we can reuse it in Documentation/Makefile. The end result is that the diff.tool and merge.tool documentation now includes an auto-generated list of all available tools. This applies on top of jk/mergetool in pu. David Aguilar (4): mergetool--lib: Simplify command expressions mergetool--lib: Improve the help text in guess_merge_tool() mergetool--lib: Add functions for finding available tools doc: Generate a list of valid merge tools Documentation/.gitignore | 1 + Documentation/Makefile | 16 +++++- Documentation/diff-config.txt | 13 ++--- Documentation/merge-config.txt | 12 ++--- git-mergetool--lib.sh | 108 ++++++++++++++++++++++------------------- 5 files changed, 87 insertions(+), 63 deletions(-) -- 1.8.0.13.gf25ae33