diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-02 16:12:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-02 16:12:04 -0700 |
| commit | 784c099a30368af4238e2713e6220688119239a1 (patch) | |
| tree | a280047ee5d0a1ec02c57664e88ed05cdb9cffed /Documentation/git-diff.txt | |
| parent | 3e4bb087a18435b12eb82116e93af2887578e816 (diff) | |
| parent | 9e6c723087def70d001740db48cf042b77a1d9cd (diff) | |
| download | git-784c099a30368af4238e2713e6220688119239a1.tar.gz | |
Merge branch 'gp/maint-diffdoc'
* 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 ce0f502468..11c4216c4a 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 -------- |