From: Johannes Schindelin Date: Mon, 17 Dec 2007 12:21:22 +0000 (+0000) Subject: Document diff.external and mergetool..path X-Git-Tag: v1.5.4-rc1~22 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=77680caadb939cf47fd08447b81faadc7c3bd436;p=git.git Document diff.external and mergetool..path There was no documentation for the config variables diff.external and mergetool..path. Noticed by Sebastian Schuberth. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index ce16fc79e..8a0df5736 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -448,6 +448,13 @@ diff.autorefreshindex:: affects only `git diff` Porcelain, and not lower level `diff` commands, such as `git diff-files`. +diff.external:: + If this config variable is set, diff generation is not + performed using the internal diff machinery, but using the + given command. Note: if you want to use an external diff + program only on a subset of your files, you might want to + use gitlink:gitattributes[5] instead. + diff.renameLimit:: The number of files to consider when performing the copy/rename detection; equivalent to the git diff option '-l'. @@ -671,6 +678,10 @@ merge..recursive:: performing an internal merge between common ancestors. See gitlink:gitattributes[5] for details. +mergetool..path:: + Override the path for the given tool. This is useful in case + your tool is not in the PATH. + pack.window:: The size of the window used by gitlink:git-pack-objects[1] when no window size is given on the command line. Defaults to 10.