Merge branch 'ap/diff-ignore-blank-lines'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index a85288f23ef13512042a783460c5dfcd347b83f1..19f78a7d5cca0c4a08681605d31a57158a869298 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -461,6 +461,9 @@ endif::git-format-patch[]
        differences even if one line has whitespace where the other
        line has none.
 
+--ignore-blank-lines::
+       Ignore changes whose lines are all blank.
+
 --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.