From: Ramkumar Ramachandra Date: Sun, 03 Apr 2011 14:25:22 GMT Subject: [PATCH 3/3] Documentation: Allow custom diff tools to be specified in 'diff.tool' Message-ID: <1301840722-24344-4-git-send-email-artagnon@gmail.com> In-Reply-To: <1301840722-24344-1-git-send-email-artagnon@gmail.com> Apart from the list of "valid values", 'diff.tool' can take any value, provided there is a corresponding 'difftool..cmd' option. Signed-off-by: Ramkumar Ramachandra --- 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..cmd' option. diff..command:: Defines the command that implements the custom diff driver. -- 1.7.4.rc1.7.g2cf08.dirty