Merge branch 'master' into next

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 338014c8162c1576796a57ab61498612948fe9dc..f523ec2fbea9a129294b960461c82382b41ac92d 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -7,6 +7,16 @@
 --patch-with-raw::
        Generate patch but keep also the default raw diff output.
 
+--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.
+
 -z::
        \0 line termination on output