Merge branch 'jh/fast-import-notes'

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 2bbe76b5d88e4a38f22bdaef8612a48ddf1fe8ba..a85b187e0479b99e137160c1190f174d80675fa1 100644 (file)
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -500,6 +500,8 @@ patterns are available:
 
 - `java` suitable for source code in the Java language.
 
+- `matlab` suitable for source code in the MATLAB language.
+
 - `objc` suitable for source code in the Objective-C language.
 
 - `pascal` suitable for source code in the Pascal/Delphi language.
@@ -955,6 +957,9 @@ frotz       unspecified
 ----------------------------------------------------------------
 
 
+SEE ALSO
+--------
+linkgit:git-check-attr[1].
 
 GIT
 ---