diff: improve positioning of add/delete blocks in diffs

[thirdparty/git.git] / Documentation / diff-config.txt

diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 7513795479a4080e007182b521773b53acb1d081..ad368acda6376a8d36712f1f5020b4ebef4a8e28 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -108,9 +108,13 @@ diff.renameLimit::
        detection; equivalent to the 'git diff' option '-l'.
 
 diff.renames::
-       Tells Git to detect renames.  If set to any boolean value, it
-       will enable basic rename detection.  If set to "copies" or
-       "copy", it will detect copies, as well.
+       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
@@ -166,6 +170,12 @@ diff.tool::
 
 include::mergetools-diff.txt[]
 
+diff.indentHeuristic::
+diff.compactionHeuristic::
+       Set one of these options to `true` to enable one of two
+       experimental heuristics that shift diff hunk boundaries to
+       make patches easier to read.
+
 diff.algorithm::
        Choose a diff algorithm.  The variants are as follows:
 +