Whether to show word-granularity differences within diff hunks.
nilNever show fine differences.
tShow fine differences for the current diff hunk only.
allShow fine differences for all displayed diff hunks.
Whether to ignore whitespace changes in word-granularity differences.
Whether to adjust the width of tabs in diffs.
Determining the correct width can be expensive if it requires
opening large and/or many files, so the widths are cached in the
magit-diff--tab-width-cache. Set that to nil to invalidate
nilNever adjust tab width. Use ‘tab-width’s value from the Magit buffer itself instead.
tIf the corresponding file-visiting buffer exits, then use
tab-width’s value from that buffer. Doing this is cheap, so this value is used even if a corresponding cache entry exists.
alwaysIf there is no such buffer, then temporarily visit the file to determine the value.
always, but don’t visit files larger than NUMBER bytes.
Specify where to highlight whitespace errors.
magit-diff-highlight-indentation. The symbol
t means in all
status means only in the status buffer, and nil means
nilNever highlight whitespace errors.
tHighlight whitespace errors everywhere.
uncommittedOnly highlight whitespace errors in diffs showing uncommitted changes. For backward compatibility
statusis treated as a synonym.
Specify in what kind of lines to highlight whitespace errors.
tHighlight only in added lines.
bothHighlight in added and removed lines.
allHighlight in added, removed and context lines.
Whether to highlight whitespace at the end of a line in diffs. Used
magit-diff-paint-whitespace is non-nil.
This option controls whether to highlight the indentation in case it
used the "wrong" indentation style. Indentation is only highlighted
magit-diff-paint-whitespace is also non-nil.
The value is an alist of the form
((REGEXP . INDENT)...). The path
to the current repository is matched against each element in reverse
order. Therefore if a REGEXP matches, then earlier elements are not
If the used INDENT is
tabs, highlight indentation with tabs. If
INDENT is an integer, highlight indentation with at least that many
spaces. Otherwise, highlight neither.
Whether to hide ^M characters at the end of a line in diffs.
This option specifies the functions used to highlight the hunk-internal region.
magit-diff-highlight-hunk-region-dim-outside overlays the outside of
the hunk internal selection with a face that causes the added and
removed lines to have the same background color as context lines.
This function should not be removed from the value of this option.
magit-diff-highlight-hunk-region-using-underline emphasize the
region by placing delimiting horizontal lines before and after it.
Both of these functions have glitches which cannot be fixed due to
limitations of Emacs’ display engine. For more information see
Instead of, or in addition to, using delimiting horizontal lines,
to emphasize the boundaries, you may wish to emphasize the text
In terminal frames it’s not possible to draw lines as the overlay and underline variants normally do, so there they fall back to calling the face function instead.
This option controls whether added and removed lines outside the
hunk-internal region only lose their distinct background color or
also the foreground color. Whether the outside of the region is
dimmed at all depends on
This option specifies additional arguments to be used alongside
The value is a list of zero or more arguments or a function that
takes no argument and returns such a list. These arguments are
--compact-summary. Also see
the git-diff(1) manpage.