aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/.gitignore
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2013-01-27 16:52:26 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-02 21:46:52 -0800
commitf35ec546008e8390e0fd8e545680e72fae0efa35 (patch)
treea9877d98b18e0cb133ff6b861e86aa9b9fb36634 /Documentation/.gitignore
parent665682c9fd81df7e2dc8fe9db28fa5918a2f8ba0 (diff)
downloadgit-f35ec546008e8390e0fd8e545680e72fae0efa35.tar.gz
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>
Diffstat (limited to 'Documentation/.gitignore')
-rw-r--r--Documentation/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index d62aebd848..2c8b2d612e 100644
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -9,4 +9,5 @@ gitman.info
howto-index.txt
doc.dep
cmds-*.txt
+mergetools-*.txt
manpage-base-url.xsl