diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:26:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:26:21 -0800 |
| commit | 77230236e38fde817f395efcf66320785cf6f9af (patch) | |
| tree | 426808f8d2f93825d74223d98daf80c71ceb1925 /Documentation | |
| parent | 9ef569791f967c1559b498d8f77a2c42a14be2ed (diff) | |
| parent | 53b10a140527253f61cfc209a4e85e132c0bc4ee (diff) | |
| download | git-77230236e38fde817f395efcf66320785cf6f9af.tar.gz | |
Merge branch 'gh/userdiff-matlab'
* gh/userdiff-matlab:
Add built-in diff patterns for MATLAB code
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitattributes.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 25e46aeb7a..a85b187e04 100644 --- 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. |