Apart from the list of "valid values", 'diff.tool' can take any value, provided there is a corresponding 'difftool.<tool>.cmd' option. Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx> --- Documentation/diff-config.txt | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 8c1732f..7f985a3 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -59,7 +59,9 @@ diff.tool:: Controls which diff tool is used. `diff.tool` overrides `merge.tool` when used by linkgit:git-difftool[1] and has the same valid values as `merge.tool` minus "tortoisemerge" - and plus "kompare". + and plus "kompare". Any other value is treated is custom + diff tool and there must be a corresponding + 'difftool.<tool>.cmd' option. diff.<driver>.command:: Defines the command that implements the custom diff driver. -- 1.7.4.rc1.7.g2cf08.dirty -- 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