[PATCH] Document diff.external and mergetool.<tool>.path
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:43:59
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] Document diff.external and mergetool.<tool>.path · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] Document diff.external and mergetool.<tool>.path · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [PATCH] Document diff.external and mergetool.<tool>.path · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] Document diff.external and mergetool.<tool>.path · Johannes Schindelin <hidden>
There was no documentation for the config variables diff.external and mergetool.<tool>.path. Noticed by Sebastian Schuberth. Signed-off-by: Johannes Schindelin <redacted> --- Documentation/config.txt | 11 +++++++++++ 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.
--
1.5.4.rc0.36.g7680