projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b2a6b71) | patch
mergetool--lib: improve show_tool_help() output
authorDavid Aguilar <davvid@gmail.com>
Fri, 25 Jan 2013 09:43:54 +0000 (01:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 02:32:54 +0000 (18:32 -0800)
commit88d3406ad77dbab4d8ea76756822531228332b1b
tree3bf91cdbb31b5f27312402c005854fd4c0fbbf01tree | snapshot
parentb2a6b7122e66d4882ef5ac31e3a03969b5b6a199commit | diff
mergetool--lib: improve show_tool_help() output

Check the can_diff and can_merge functions before deciding whether
to add the tool to the available/unavailable lists.  This makes
"--tool-help" context-sensitive so that "git mergetool --tool-help"
displays merge tools only and "git difftool --tool-help" displays
diff tools only.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mergetool--lib.sh diff | blob | history
Git—the stupid content tracker