Home Explore Blog CI



git

1st chunk of `Documentation/config/diff.adoc`
654a79d2a3e2e4b598f897e03fe0736efe44661b4d6aa4830000000100000fa0
`diff.autoRefreshIndex`::
	When using `git diff` to compare with work tree
	files, do not consider stat-only changes as changed.
	Instead, silently run `git update-index --refresh` to
	update the cached stat information for paths whose
	contents in the work tree match the contents in the
	index.  This option defaults to `true`.  Note that this
	affects only `git diff` Porcelain, and not lower level
	`diff` commands such as `git diff-files`.

`diff.dirstat`::
ifdef::git-diff[]
	A comma separated list of `--dirstat` parameters specifying the
	default behavior of the `--dirstat` option to `git diff` and friends.
endif::git-diff[]
ifndef::git-diff[]
	A comma separated list of `--dirstat` parameters specifying the
	default behavior of the `--dirstat` option to linkgit:git-diff[1]
	and friends.
endif::git-diff[]
	The defaults can be overridden on the command line
	(using `--dirstat=<param>,...`). The fallback defaults
	(when not changed by `diff.dirstat`) are `changes,noncumulative,3`.
	The following parameters are available:
+
--
`changes`;;
	Compute the dirstat numbers by counting the lines that have been
	removed from the source, or added to the destination. This ignores
	the amount of pure code movements within a file.  In other words,
	rearranging lines in a file is not counted as much as other changes.
	This is the default behavior when no parameter is given.
`lines`;;
	Compute the dirstat numbers by doing the regular line-based diff
	analysis, and summing the removed/added line counts. (For binary
	files, count 64-byte chunks instead, since binary files have no
	natural concept of lines). This is a more expensive `--dirstat`
	behavior than the `changes` behavior, but it does count rearranged
	lines within a file as much as other changes. The resulting output
	is consistent with what you get from the other `--*stat` options.
`files`;;
	Compute the dirstat numbers by counting the number of files changed.
	Each changed file counts equally in the dirstat analysis. This is
	the computationally cheapest `--dirstat` behavior, since it does
	not have to look at the file contents at all.
`cumulative`;;
	Count changes in a child directory for the parent directory as well.
	Note that when using `cumulative`, the sum of the percentages
	reported may exceed 100%. The default (non-cumulative) behavior can
	be specified with the `noncumulative` parameter.
_<limit>_;;
	An integer parameter specifies a cut-off percent (3% by default).
	Directories contributing less than this percentage of the changes
	are not shown in the output.
--
+
Example: The following will count changed files, while ignoring
directories with less than 10% of the total amount of changed files,
and accumulating child directory counts in the parent directories:
`files,10,cumulative`.

`diff.statNameWidth`::
	Limit the width of the filename part in `--stat` output. If set, applies
	to all commands generating `--stat` output except `format-patch`.

`diff.statGraphWidth`::
	Limit the width of the graph part in `--stat` output. If set, applies
	to all commands generating `--stat` output except `format-patch`.

`diff.context`::
	Generate diffs with _<n>_ lines of context instead of the default
	of 3. This value is overridden by the `-U` option.

`diff.interHunkContext`::
	Show the context between diff hunks, up to the specified number
	of lines, thereby fusing the hunks that are close to each other.
	This value serves as the default for the `--inter-hunk-context`
	command line option.

`diff.external`::
	If this config variable is set, diff generation is not
	performed using the internal diff machinery, but using the
	given command.  Can be overridden with the `GIT_EXTERNAL_DIFF`
	environment variable.  The command is called with parameters
	as described under "git Diffs" in linkgit:git[1].  Note: if
	you want to use an external diff program only on a subset of
	your files, you might want to use linkgit:gitattributes[5] instead.

`diff.trustExitCode`::
	If this boolean value is

Title: Git Diff Configuration Options
Summary
This section describes various configuration options available for customizing the behavior of Git's diff commands, including auto-refreshing the index, displaying directory statistics, and setting output formats.