On Wed, Aug 8, 2012 at 11:26 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > I do not have a strong reason to vote for or against inclusion of > yet another tool as mergetool backends (read: Meh), but what this That sounds almost as if you'd like to keep the number of directly supported mergetools small (I'm not talking about about the length of the list of mergetools in the docs right now). I was always thinking, the more mergetools, the better. Do you think differently? > patch does to Documentation/merge-config.txt is actively unwelcome. > > As we discussed earlier in > > http://thread.gmane.org/gmane.comp.version-control.git/201913/focus=201976 > > the longer term direction is to reduce the names of tools listed > there. > > I am somewhat saddened to find your name in that thread; you should > have been aware of that discussion when you wrote this patch. I still agree that not listing all mergetools in multiple places is a good thing. But doing the whole stuff of extending --tool-help for git-mergetool and git-difftool to return a simple list that can be used in git-completion.bash etc. IMHO is a separate topic and out of scope of this patch. If it helps to accept the patch, I can send a v2 that changes merge-config.txt and diff-config.txt to refer to "git-mergetool --tool-help" and "git-difftool --tool-help" instead of naming any actual tools. -- Sebastian Schuberth -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html