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 edba56522bce6e868eb04ad03987d8b078ac907e..ad368acda6376a8d36712f1f5020b4ebef4a8e28 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -75,7 +75,7 @@ diff.ignoreSubmodules::
        commands such as 'git diff-files'. 'git checkout' also honors
        this setting when reporting uncommitted changes. Setting it to
        'all' disables the submodule summary normally shown by 'git commit'
-       and 'git status' when 'status.submoduleSummary' is set unless it is
+       and 'git status' when `status.submoduleSummary` is set unless it is
        overridden by using the --ignore-submodules command-line option.
        The 'git submodule' commands are not affected by this setting.
 
@@ -170,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:
 +