Re: [PATCH 4/4] git-difftool: use git-mergetool--lib for "--tool-help"

2013-01-25 Thread John Keeping
On Fri, Jan 25, 2013 at 01:55:03AM -0800, David Aguilar wrote: > list_merge_tool_candidates() has a bunch of other special cases > for $EDITOR, $DISPLAY, $GNOME-something and such so I think > we should keep using it only for the guess_merge_tool() path. > > I honestly want to remove list_merge_to

Re: [PATCH 4/4] git-difftool: use git-mergetool--lib for "--tool-help"

2013-01-25 Thread David Aguilar
On Fri, Jan 25, 2013 at 1:19 AM, John Keeping wrote: > On Thu, Jan 24, 2013 at 09:29:58PM -0800, David Aguilar wrote: >> On Thu, Jan 24, 2013 at 11:55 AM, John Keeping wrote: >> > The "--tool-help" option to git-difftool currently displays incorrect >> > output since it uses the names of the file

Re: [PATCH 4/4] git-difftool: use git-mergetool--lib for "--tool-help"

2013-01-25 Thread John Keeping
On Thu, Jan 24, 2013 at 09:29:58PM -0800, David Aguilar wrote: > On Thu, Jan 24, 2013 at 11:55 AM, John Keeping wrote: > > The "--tool-help" option to git-difftool currently displays incorrect > > output since it uses the names of the files in > > "$GIT_EXEC_PATH/mergetools/" rather than the list

Re: [PATCH 4/4] git-difftool: use git-mergetool--lib for "--tool-help"

2013-01-24 Thread David Aguilar
On Thu, Jan 24, 2013 at 11:55 AM, John Keeping wrote: > The "--tool-help" option to git-difftool currently displays incorrect > output since it uses the names of the files in > "$GIT_EXEC_PATH/mergetools/" rather than the list of command names in > git-mergetool--lib. > > Fix this by simply delega

[PATCH 4/4] git-difftool: use git-mergetool--lib for "--tool-help"

2013-01-24 Thread John Keeping
The "--tool-help" option to git-difftool currently displays incorrect output since it uses the names of the files in "$GIT_EXEC_PATH/mergetools/" rather than the list of command names in git-mergetool--lib. Fix this by simply delegating the "--tool-help" argument to the show_tool_help function in