projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 665682c) | patch
doc: generate a list of valid merge tools
authorDavid Aguilar <davvid@gmail.com>
Mon, 28 Jan 2013 00:52:26 +0000 (16:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Feb 2013 05:46:52 +0000 (21:46 -0800)
commitf35ec546008e8390e0fd8e545680e72fae0efa35
treea9877d98b18e0cb133ff6b861e86aa9b9fb36634tree | snapshot
parent665682c9fd81df7e2dc8fe9db28fa5918a2f8ba0commit | diff
doc: generate a list of valid merge tools

Use the show_tool_names() 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 <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/.gitignore diff | blob | history
Documentation/Makefile diff | blob | history
Documentation/diff-config.txt diff | blob | history
Documentation/merge-config.txt diff | blob | history
git-mergetool--lib.sh diff | blob | history
Git—the stupid content tracker