mergetool: include custom tools in '--tool-help'

2013-01-27 Thread John Keeping
'git mergetool --tool-help' only lists builtin tools, not those that the user has configured via a 'mergetool.tool.cmd' config value. Fix this by inspecting the tools configured in this way and adding them to the available and unavailable lists before displaying them. Signed-off-by: John Keeping

Re: mergetool: include custom tools in '--tool-help'

2013-01-27 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: I think I'd want to do this with a suffix if at all, so the output would be like this: 'git mergetool --tool=tool' may be set to one of the following: araxis gvimdiff gvimdiff2 mytool

Re: mergetool: include custom tools in '--tool-help'

2013-01-27 Thread David Aguilar
On Sun, Jan 27, 2013 at 12:13 PM, Junio C Hamano gits...@pobox.com wrote: John Keeping j...@keeping.me.uk writes: I think I'd want to do this with a suffix if at all, so the output would be like this: 'git mergetool --tool=tool' may be set to one of the following: araxis