1 diff.autorefreshindex::
2 When using 'git diff' to compare with work tree
3 files, do not consider stat-only change as changed.
4 Instead, silently run `git update-index --refresh` to
5 update the cached stat information for paths whose
6 contents in the work tree match the contents in the
7 index. This option defaults to true. Note that this
8 affects only 'git diff' Porcelain, and not lower level
9 'diff' commands such as 'git diff-files'.
12 If this config variable is set, diff generation is not
13 performed using the internal diff machinery, but using the
14 given command. Can be overridden with the `GIT_EXTERNAL_DIFF'
15 environment variable. The command is called with parameters
16 as described under "git Diffs" in linkgit:git[1]. Note: if
17 you want to use an external diff program only on a subset of
18 your files, you might want to use linkgit:gitattributes[5] instead.
20 diff.ignoreSubmodules::
21 Sets the default value of --ignore-submodules. Note that this
22 affects only 'git diff' Porcelain, and not lower level 'diff'
23 commands such as 'git diff-files'. 'git checkout' also honors
24 this setting when reporting uncommitted changes.
27 If set, 'git diff' uses a prefix pair that is different from the
28 standard "a/" and "b/" depending on what is being compared. When
29 this configuration is in effect, reverse diff output also swaps
30 the order of the prefixes:
32 compares the (i)ndex and the (w)ork tree;
34 compares a (c)ommit and the (w)ork tree;
36 compares a (c)ommit and the (i)ndex;
37 `git diff HEAD:file1 file2`;;
38 compares an (o)bject and a (w)ork tree entity;
39 `git diff --no-index a b`;;
40 compares two non-git things (1) and (2).
43 If set, 'git diff' does not show any source or destination prefix.
46 The number of files to consider when performing the copy/rename
47 detection; equivalent to the 'git diff' option '-l'.
50 Tells git to detect renames. If set to any boolean value, it
51 will enable basic rename detection. If set to "copies" or
52 "copy", it will detect copies, as well.
54 diff.suppressBlankEmpty::
55 A boolean to inhibit the standard behavior of printing a space
56 before each empty output line. Defaults to false.
59 Controls which diff tool is used. `diff.tool` overrides
60 `merge.tool` when used by linkgit:git-difftool[1] and has
61 the same valid values as `merge.tool` minus "tortoisemerge"