Merge branch 'gp/maint-diffdoc'

* gp/maint-diffdoc:
git-diff.txt: add section "output format" describing the diff formats

diff --combined Documentation/git-diff.txt
index ce0f5024687056b696fe5e77362a6f01b18dd0bd,201d5daf1a98e510bbf838ab2a66c07bae88f991..11c4216c4a5c705c6af55b1367cae96b13c20251
--- 1/Documentation/git-diff.txt
--- 2/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@@ -82,6 -82,9 +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
  --------
@@@ -125,7 -128,7 +128,7 @@@ $ git diff topic...master  <3
  +
  <1> Changes between the tips of the topic and the master branches.
  <2> Same as above.
 -<3> Changes that occured on the master branch since when the topic
 +<3> Changes that occurred on the master branch since when the topic
  branch was started off it.
  
  Limiting the diff output::