Merge branch 'jk/common-main-2.8' into jk/common-main

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 3cb301556eb2c6571298020cdea0374eb771638f..d9ae681d8ff676a80e757adb76b02787a5c091c7 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -63,6 +63,13 @@ 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 (which is off by default) 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.