blob: 67a90a828c04b7277fc603c6518fd0ecd8247d32 [file] [log] [blame]
Junio C Hamano209ebe82011-04-27 21:09:591diff.autorefreshindex::
2When using 'git diff' to compare with work tree
3files, do not consider stat-only change as changed.
4Instead, silently run `git update-index --refresh` to
5update the cached stat information for paths whose
6contents in the work tree match the contents in the
7index. This option defaults to true. Note that this
8affects only 'git diff' Porcelain, and not lower level
9'diff' commands such as 'git diff-files'.
10
Junio C Hamano1c222c52011-05-13 19:55:3211diff.dirstat::
12A comma separated list of `--dirstat` parameters specifying the
13default behavior of the `--dirstat` option to linkgit:git-diff[1]`
14and friends. The defaults can be overridden on the command line
15(using `--dirstat=<param1,param2,...>`). The fallback defaults
16(when not changed by `diff.dirstat`) are `changes,noncumulative,3`.
17The following parameters are available:
18+
19--
20`changes`;;
21Compute the dirstat numbers by counting the lines that have been
22removed from the source, or added to the destination. This ignores
23the amount of pure code movements within a file. In other words,
24rearranging lines in a file is not counted as much as other changes.
25This is the default behavior when no parameter is given.
26`lines`;;
27Compute the dirstat numbers by doing the regular line-based diff
28analysis, and summing the removed/added line counts. (For binary
29files, count 64-byte chunks instead, since binary files have no
30natural concept of lines). This is a more expensive `--dirstat`
31behavior than the `changes` behavior, but it does count rearranged
32lines within a file as much as other changes. The resulting output
33is consistent with what you get from the other `--*stat` options.
34`files`;;
35Compute the dirstat numbers by counting the number of files changed.
36Each changed file counts equally in the dirstat analysis. This is
37the computationally cheapest `--dirstat` behavior, since it does
38not have to look at the file contents at all.
39`cumulative`;;
40Count changes in a child directory for the parent directory as well.
41Note that when using `cumulative`, the sum of the percentages
42reported may exceed 100%. The default (non-cumulative) behavior can
43be specified with the `noncumulative` parameter.
44<limit>;;
45An integer parameter specifies a cut-off percent (3% by default).
46Directories contributing less than this percentage of the changes
47are not shown in the output.
48--
49+
50Example: The following will count changed files, while ignoring
51directories with less than 10% of the total amount of changed files,
52and accumulating child directory counts in the parent directories:
53`files,10,cumulative`.
54
Junio C Hamanoaea9e6b2012-03-07 00:17:1155diff.statGraphWidth::
56Limit the width of the graph part in --stat output. If set, applies
Junio C Hamano010705a2012-06-19 23:37:2657to all commands generating --stat output except format-patch.
Junio C Hamanoaea9e6b2012-03-07 00:17:1158
Junio C Hamano209ebe82011-04-27 21:09:5959diff.external::
60If this config variable is set, diff generation is not
61performed using the internal diff machinery, but using the
62given command. Can be overridden with the `GIT_EXTERNAL_DIFF'
63environment variable. The command is called with parameters
64as described under "git Diffs" in linkgit:git[1]. Note: if
65you want to use an external diff program only on a subset of
66your files, you might want to use linkgit:gitattributes[5] instead.
67
68diff.ignoreSubmodules::
69Sets the default value of --ignore-submodules. Note that this
70affects only 'git diff' Porcelain, and not lower level 'diff'
71commands such as 'git diff-files'. 'git checkout' also honors
72this setting when reporting uncommitted changes.
73
74diff.mnemonicprefix::
75If set, 'git diff' uses a prefix pair that is different from the
76standard "a/" and "b/" depending on what is being compared. When
77this configuration is in effect, reverse diff output also swaps
78the order of the prefixes:
79`git diff`;;
80compares the (i)ndex and the (w)ork tree;
81`git diff HEAD`;;
82 compares a (c)ommit and the (w)ork tree;
83`git diff --cached`;;
84compares a (c)ommit and the (i)ndex;
85`git diff HEAD:file1 file2`;;
86compares an (o)bject and a (w)ork tree entity;
87`git diff --no-index a b`;;
88compares two non-git things (1) and (2).
89
90diff.noprefix::
91If set, 'git diff' does not show any source or destination prefix.
92
93diff.renameLimit::
94The number of files to consider when performing the copy/rename
95detection; equivalent to the 'git diff' option '-l'.
96
97diff.renames::
98Tells git to detect renames. If set to any boolean value, it
99will enable basic rename detection. If set to "copies" or
100"copy", it will detect copies, as well.
101
102diff.suppressBlankEmpty::
103A boolean to inhibit the standard behavior of printing a space
104before each empty output line. Defaults to false.
105
106diff.<driver>.command::
107The custom diff driver command. See linkgit:gitattributes[5]
108for details.
109
110diff.<driver>.xfuncname::
111The regular expression that the diff driver should use to
112recognize the hunk header. A built-in pattern may also be used.
113See linkgit:gitattributes[5] for details.
114
115diff.<driver>.binary::
116Set this option to true to make the diff driver treat files as
117binary. See linkgit:gitattributes[5] for details.
118
119diff.<driver>.textconv::
120The command that the diff driver should call to generate the
121text-converted version of a file. The result of the
122conversion is used to generate a human-readable diff. See
123linkgit:gitattributes[5] for details.
124
125diff.<driver>.wordregex::
126The regular expression that the diff driver should use to
127split words in a line. See linkgit:gitattributes[5] for
128details.
129
130diff.<driver>.cachetextconv::
131Set this option to true to make the diff driver cache the text
132conversion outputs. See linkgit:gitattributes[5] for details.
133
134diff.tool::
135The diff tool to be used by linkgit:git-difftool[1]. This
136option overrides `merge.tool`, and has the same valid built-in
137values as `merge.tool` minus "tortoisemerge" and plus
138"kompare". Any other value is treated as a custom diff tool,
139and there must be a corresponding `difftool.<tool>.cmd`
140option.