[PATCH] Documentation/difftool: add deltawalker to list of valid diff tools
- From
Tim Henigan <tim.henigan@gmail.com>
- Date
- Mar 15, 2012, 16:28 UTC
- Message-ID
- <1331828906-5943-1-git-send-email-tim.henigan@gmail.com>
deltawalker has been supported since 284a126c3ef3, but was not added to the list of valid diff tools reported by 'git difftool --help'.
Signed-off-by: Tim Henigan <tim.henigan@gmail.com> ---
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"?
Documentation/git-difftool.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 19d473c..fe38f66 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -32,8 +32,9 @@ OPTIONS --tool=<tool>:: Use the diff tool specified by <tool>. Valid diff tools are: - araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3, - kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff. + araxis, bc3, deltawalker, diffuse, emerge, ecmerge, gvimdiff, + kdiff3, kompare, meld, opendiff, p4merge, tkdiff, vimdiff and + xxdiff. + If a diff tool is not specified, 'git difftool' will use the configuration variable `diff.tool`. If the
-- 1.7.10.rc1