Skip to content

Commit 77085a6

Browse files
committed
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 <[email protected]>
1 parent d634d61 commit 77085a6

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

Documentation/diff-config.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,6 @@ diff.tool::
166166

167167
include::mergetools-diff.txt[]
168168

169-
diff.compactionHeuristic::
170-
Set this option to enable an experimental heuristic that
171-
shifts the hunk boundary in an attempt to make the resulting
172-
patch easier to read.
173-
174169
diff.algorithm::
175170
Choose a diff algorithm. The variants are as follows:
176171
+

Documentation/diff-options.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@ ifndef::git-format-patch[]
6363
Synonym for `-p --raw`.
6464
endif::git-format-patch[]
6565

66-
--compaction-heuristic::
67-
--no-compaction-heuristic::
68-
These are to help debugging and tuning an experimental
69-
heuristic that shifts the hunk boundary in an attempt to
70-
make the resulting patch easier to read.
71-
7266
--minimal::
7367
Spend extra time to make sure the smallest possible
7468
diff is produced.

0 commit comments

Comments
 (0)