From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Nov 2007 23:12:04 +0000 (-0700)
Subject: Merge branch 'gp/maint-diffdoc'
X-Git-Tag: v1.5.4-rc0~288
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/784c099a30368af4238e2713e6220688119239a1?ds=inline;hp=-c

Merge branch 'gp/maint-diffdoc'

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

784c099a30368af4238e2713e6220688119239a1
diff --combined Documentation/git-diff.txt
index ce0f502468,201d5daf1a..11c4216c4a
--- a/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::