diff options
| author |  Gerrit Pape <pape@smarden.org> | 2007-10-31 13:59:16 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-11-01 17:07:22 -0700 |
| commit | 9e6c723087def70d001740db48cf042b77a1d9cd (patch) | |
| tree | c41e32835707297d5965061e6841599f2d7378eb /Documentation/git-diff.txt | |
| parent | git-format-patch.txt: fix explanation of an example. (diff) | |
| download | tgif-9e6c723087def70d001740db48cf042b77a1d9cd.tar.xz | |
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.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index db2eb46a19..201d5daf1a 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 -------- |