diff: undocument the compaction heuristic knobs for experimentation

It seems that people around here are all happy with the updated
heuristics used to decide where the hunks are separated.  Let's keep
that as the default.  Even though we do not expect too much trouble
from the difference between the old and the new algorithms, just in
case let's leave the implementation of the knobs to turn it off for
emergencies.  There is no longer need for documenting them, though.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 9bf3e923cf564604a4d2b40bb1577992b436cd6b..6eaa45271c9ff2d1200e4299c3040d52952a2ec4 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -166,11 +166,6 @@ diff.tool::
 
 include::mergetools-diff.txt[]
 
 
 include::mergetools-diff.txt[]
 

-diff.compactionHeuristic::
-       Set this option to enable an experimental heuristic that
-       shifts the hunk boundary in an attempt to make the resulting
-       patch easier to read.
-

 diff.algorithm::
        Choose a diff algorithm.  The variants are as follows:
 +
 diff.algorithm::
        Choose a diff algorithm.  The variants are as follows:
 +

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index b513023cd76f8505c254338c14bce84a234a7ac4..3ad6404dbcf2915721ac963085bbc0269c1d7312 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -63,12 +63,6 @@ ifndef::git-format-patch[]
        Synonym for `-p --raw`.
 endif::git-format-patch[]
 
        Synonym for `-p --raw`.
 endif::git-format-patch[]
 

---compaction-heuristic::
---no-compaction-heuristic::
-       These are to help debugging and tuning an experimental
-       heuristic that shifts the hunk boundary in an attempt to
-       make the resulting patch easier to read.
-

 --minimal::
        Spend extra time to make sure the smallest possible
        diff is produced.
 --minimal::
        Spend extra time to make sure the smallest possible
        diff is produced.