diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-11-10 09:10:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-10 09:10:51 -0800 |
| commit | c444c16589f95ac22d8e3ffe603cd7f0613512ce (patch) | |
| tree | 31d2e0c2a77344201af6f3ee5427f47218dec9bb /Documentation/git-diff.txt | |
| parent | Merge 'build-in git-mktree' (diff) | |
| parent | Move 'builtin-*' into a 'builtin/' subdirectory (diff) | |
| download | tgif-c444c16589f95ac22d8e3ffe603cd7f0613512ce.tar.xz | |
Merge "Move 'builtin-*' into a 'builtin/' subdirectory"
Diffstat (limited to 'Documentation/git-diff.txt')
| -rw-r--r-- | Documentation/git-diff.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index a2f192fb75..723a64872f 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -84,8 +84,7 @@ 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 @@ -158,6 +157,10 @@ $ git diff -R <2> rewrites (very expensive). <2> Output diff in reverse. +SEE ALSO +-------- +linkgit:git-difftool[1]:: + Show changes using common diff tools Author ------ |