diff: add option to show context between close hunks

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index c62b45cdbade990878b8e8e9371d41d4e3c43bfe..c7fcc8007af18163d7d1583e116b625b54d428ca 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -215,6 +215,10 @@ endif::git-format-patch[]
 -w::
        Shorthand for "--ignore-all-space".
 
+--inter-hunk-context=<lines>::
+       Show the context between diff hunks, up to the specified number
+       of lines, thereby fusing hunks that are close to each other.
+
 --exit-code::
        Make the program exit with codes similar to diff(1).
        That is, it exits with 1 if there were differences and