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