Sebastian Schuberth <sschube...@gmail.com> writes:
> Signed-off-by: Sebastian Schuberth <sschube...@gmail.com>
> Documentation/git-difftool.txt | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
> diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
> index 31fc2e3..5dd54f1 100644
> --- a/Documentation/git-difftool.txt
> +++ b/Documentation/git-difftool.txt
> @@ -36,9 +36,12 @@ OPTIONS
> -t <tool>::
> - Use the diff tool specified by <tool>. Valid values include
> - emerge, kompare, meld, and vimdiff. Run `git difftool --tool-help`
> - for the list of valid <tool> settings.
I thought we say "include" because we really do not want to list
millions of tools here, so mild NAK on this part.
> + Use the diff tool specified by <tool>. Valid diff tools are:
> + araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kcompare, kdiff3,
> + meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
> + List the supported and available diff tools.
This part is a good addition (but it already is mentioned in the
description of --tool above, so it is more or less a "Meh").
> If a diff tool is not specified, 'git difftool'
> will use the configuration variable `diff.tool`. If the
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html