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>
Johannes Schindelin committed
Dec 17, 2007 at 12:21 UTC
77680caadb939cf47fd08447b81faadc7c3bd436
1 file changed
+11
Documentation/config.txt
+11
@@ -448,6 +448,13 @@ diff.autorefreshindex::
448
affects only `git diff` Porcelain, and not lower level
449
`diff` commands, such as `git diff-files`.
450
451
+diff.external::
452
+ If this config variable is set, diff generation is not
453
+ performed using the internal diff machinery, but using the
454
+ given command. Note: if you want to use an external diff
455
+ program only on a subset of your files, you might want to
456
+ use gitlink:gitattributes[5] instead.
457
+
458
diff.renameLimit::
459
The number of files to consider when performing the copy/rename
460
detection; equivalent to the git diff option '-l'.
@@ -671,6 +678,10 @@ merge.<driver>.recursive::
678
performing an internal merge between common ancestors.
679
See gitlink:gitattributes[5] for details.
680
681
+mergetool.<tool>.path::
682
+ Override the path for the given tool. This is useful in case
683
+ your tool is not in the PATH.
684
+
685
pack.window::
686
The size of the window used by gitlink:git-pack-objects[1] when no
687
window size is given on the command line. Defaults to 10.