summaryrefslogtreecommitdiff
path: root/Documentation/git-diff.txt
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2007-10-31 13:59:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-02 00:07:22 (GMT)
commit9e6c723087def70d001740db48cf042b77a1d9cd (patch)
treec41e32835707297d5965061e6841599f2d7378eb /Documentation/git-diff.txt
parent136e6316705e9e83cbb09c2a9ac4cb29c3e4662d (diff)
downloadgit-9e6c723087def70d001740db48cf042b77a1d9cd.zip
git-9e6c723087def70d001740db48cf042b77a1d9cd.tar.gz
git-9e6c723087def70d001740db48cf042b77a1d9cd.tar.bz2
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>
Diffstat (limited to 'Documentation/git-diff.txt')
-rw-r--r--Documentation/git-diff.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index db2eb46..201d5da 100644
--- 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
--------