Merge branch 'bc/reread-attributes-during-rebase'

diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt
index 5afb5a2cbc69b763263e3e265343884c0ff64dda..ff09f1cf737c062898ac40555402de097d360eb9 100644 (file)
--- a/Documentation/config/diff.txt
+++ b/Documentation/config/diff.txt
@@ -189,7 +189,7 @@ diff.guitool::
 include::../mergetools-diff.txt[]
 
 diff.indentHeuristic::
-       Set this option to `true` to enable experimental heuristics
+       Set this option to `false` to disable the default heuristics
        that shift diff hunk boundaries to make patches easier to read.
 
 diff.algorithm::