Home Explore Blog CI



git

3rd chunk of `Documentation/config/diff.adoc`
0655a1b0ec39c4e5a00ff8c52c63452027f5f51e5b2b1d1a00000001000009b1
 show pathnames relative to the current directory.

`diff.orderFile`::
	File indicating how to order files within a diff.
ifdef::git-diff[]
	See the `-O` option for details.
endif::git-diff[]
ifndef::git-diff[]
	See the `-O` option to linkgit:git-diff[1] for details.
endif::git-diff[]
	If `diff.orderFile` is a relative pathname, it is treated as
	relative to the top of the working tree.

`diff.renameLimit`::
	The number of files to consider in the exhaustive portion of
	copy/rename detection; equivalent to the `git diff` option
	`-l`.  If not set, the default value is currently 1000.  This
	setting has no effect if rename detection is turned off.

`diff.renames`::
	Whether and how Git detects renames.  If set to `false`,
	rename detection is disabled. If set to `true`, basic rename
	detection is enabled.  If set to `copies` or `copy`, Git will
	detect copies, as well.  Defaults to `true`.  Note that this
	affects only `git diff` Porcelain like linkgit:git-diff[1] and
	linkgit:git-log[1], and not lower level commands such as
	linkgit:git-diff-files[1].

`diff.suppressBlankEmpty`::
	A boolean to inhibit the standard behavior of printing a space
	before each empty output line. Defaults to `false`.

`diff.submodule`::
	Specify the format in which differences in submodules are
	shown.  The `short` format just shows the names of the commits
	at the beginning and end of the range. The `log` format lists
	the commits in the range like linkgit:git-submodule[1] `summary`
	does. The `diff` format shows an inline diff of the changed
	contents of the submodule. Defaults to `short`.

`diff.wordRegex`::
	A POSIX Extended Regular Expression used to determine what is a "word"
	when performing word-by-word difference calculations.  Character
	sequences that match the regular expression are "words", all other
	characters are *ignorable* whitespace.

`diff.<driver>.command`::
	The custom diff driver command.  See linkgit:gitattributes[5]
	for details.

`diff.<driver>.trustExitCode`::
	If this boolean value is set to `true` then the
	`diff.<driver>.command` command is expected to return exit code
	0 if it considers the input files to be equal or 1 if it
	considers them to be different, like `diff`(1).
	If it is set to `false`, which is the default, then the command
	is expected to return exit code 0 regardless of equality.
	Any other exit code causes Git to report a fatal error.

`diff.<driver>.xfuncname`::
	The regular expression that the diff driver should

Title: Advanced Git Diff Configuration Options
Summary
This section describes additional configuration options for customizing Git's diff behavior, including file ordering, rename detection, whitespace handling, and custom diff driver settings, allowing for fine-grained control over the diff process.