diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-05 18:56:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-05 18:56:55 -0800 |
| commit | 62c666a7034a3aed6792280589bb78205781aa68 (patch) | |
| tree | 941ab0154ef4faf36b63cd725e386c85b072b698 /Documentation/git-diff.txt | |
| parent | git-daemon: fix remote port number in log entry (diff) | |
| parent | git-diff.txt: add section "output format" describing the diff formats (diff) | |
| download | tgif-62c666a7034a3aed6792280589bb78205781aa68.tar.xz | |
Merge branch 'gp/maint-diffdoc' into maint
* gp/maint-diffdoc:
git-diff.txt: add section "output format" describing the diff formats
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 -------- |