summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-02 17:36:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-05-02 17:36:36 (GMT)
commit77085a616b0fe0eaba99dfe27247ae733f1570e9 (patch)
tree1d74d8b4aea4c099957ddfe978875a70f095c249 /Documentation/diff-options.txt
parentd634d61ed6c5f19948937012b5e3a0ed2d631d3f (diff)
downloadgit-77085a616b0fe0eaba99dfe27247ae733f1570e9.zip
git-77085a616b0fe0eaba99dfe27247ae733f1570e9.tar.gz
git-77085a616b0fe0eaba99dfe27247ae733f1570e9.tar.bz2
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>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt6
1 files changed, 0 insertions, 6 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index b513023..3ad6404 100644
--- 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[]
---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.