Re: [PATCH] Documentation/difftool: add deltawalker to list of valid diff tools

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 15, 2012, 20:56 UTC
Message-ID: <7v3999k2h5.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1331828906-5943-1-git-send-email-tim.henigan@gmail.com>

Tim Henigan <tim.henigan@gmail.com> writes:

Show 6 quoted lines

> The list of valid tools seems prone to error. Right now, there is nothing
> that tells people to update this documentation when new config files are
> added to 'mergetools'.  Should I add a README to 'mergetools' with
> instructions to update this file?  Or would it be better to replace the
> list in the help string with a more general statement like "<tool> must
> match one of the files located in $(git --exec-path)/mergetools"?

I would prefer to rip most of them out from this list in the documentation, and refer people to ask the installed version of "git difftool" to list them. After bc7a96a (mergetool--lib: Refactor tools into separate files, 2011-08-18), that should be the most sensible option. I.e.

	--tool=<tool>::
		Use the diff tool specified by <tool>.  Valid diff tools
                include emerge, kompare, meld, and vimdiff; for complete
                list, run 'git difftool --tool-help'

or something.