git-diff.txt: add section "output format" describing the diff formats
authorGerrit Pape <pape@smarden.org>
Wed, 31 Oct 2007 13:59:16 +0000 (13:59 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2007 00:07:22 +0000 (17:07 -0700)
commit9e6c723087def70d001740db48cf042b77a1d9cd
treec41e32835707297d5965061e6841599f2d7378eb
parent136e6316705e9e83cbb09c2a9ac4cb29c3e4662d
git-diff.txt: add section "output format" describing the diff formats

git-diff.txt includes diff-options.txt which for the -p option refers
to a section "generating patches.." which is missing from the git-diff
documentation.  This patch adapts diff-format.txt to additionally
mention the git-diff program, and includes diff-format.txt into
git-diff.txt.

Tino Keitel noticed this problem.

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/diff-format.txt
Documentation/git-diff.txt