Merge branch 'maint'

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index a2f192fb7519117f8e47f3ec4608e3301c200dc3..723a64872fd4b43612d576781d915a7538189f46 100644 (file)
--- 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
 ------