summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-12-17 12:21:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-18 04:49:18 (GMT)
commit77680caadb939cf47fd08447b81faadc7c3bd436 (patch)
treea466caa682f91707ffd5b965c9b1b294e45b1ff9 /Documentation/config.txt
parentcbe021004fc8762076bf497cc0b259d110b3a753 (diff)
downloadgit-77680caadb939cf47fd08447b81faadc7c3bd436.zip
git-77680caadb939cf47fd08447b81faadc7c3bd436.tar.gz
git-77680caadb939cf47fd08447b81faadc7c3bd436.tar.bz2
Document diff.external and mergetool.<tool>.path
There was no documentation for the config variables diff.external and mergetool.<tool>.path. Noticed by Sebastian Schuberth. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ce16fc7..8a0df57 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.<driver>.recursive::
performing an internal merge between common ancestors.
See gitlink:gitattributes[5] for details.
+mergetool.<tool>.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.