Merge branch 'master' into next

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index c183dc9da0392bcfbae3e1edcd4d13f89a9923c3..f523ec2fbea9a129294b960461c82382b41ac92d 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -10,6 +10,10 @@
 --stat::
        Generate a diffstat instead of a patch.
 
+--summary::
+       Output a condensed summary of extended header information
+       such as creations, renames and mode changes.
+
 --patch-with-stat::
        Generate patch and prepend its diffstat.