| commit | 9e6c723087def70d001740db48cf042b77a1d9cd | |
| author | Gerrit Pape <pape@smarden.org> | |
| Wed, 31 Oct 2007 13:59:16 +0000 (31 13:59 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 2 Nov 2007 00:07:22 +0000 (1 17:07 -0700) | ||
| tree | c41e32835707297d5965061e6841599f2d7378eb | treesnapshot (tar.gz zip) |
| parent | 136e6316705e9e83cbb09c2a9ac4cb29c3e4662d | commitdiff |
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>
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 | diffblobblamehistory | |
| Documentation/git-diff.txt | diffblobblamehistory |