Merge master into aw/mirror-push

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index ce0f5024687056b696fe5e77362a6f01b18dd0bd..11c4216c4a5c705c6af55b1367cae96b13c20251 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -82,6 +82,9 @@ include::diff-options.txt[]
        the diff to the named paths (you can give directory
        names and get diff for all files under them).
 
+Output format
+-------------
+include::diff-format.txt[]
 
 EXAMPLES
 --------