diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-17 20:15:17 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-17 20:15:17 +0300 |
| commit | 2f475317f2a3f8cf3b1a4bd16445ff9fecfd30df (patch) | |
| tree | f74823fb4c205fb20014dd707ebdd4cbc9166236 /Documentation | |
| parent | 94760948f17e1902e071172677e0615da6e03d90 (diff) | |
| parent | 2731a7840a462a97b8afb5beadaf36c1db992ac7 (diff) | |
Merge branch 'bl/userdiff-octave'
The pattern "git diff/grep" use to extract funcname and words
boundary for Matlab has been extend to cover Octave, which is more
or less equivalent.
* bl/userdiff-octave:
userdiff: fix grammar and style issues
userdiff: add Octave
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitattributes.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 4fb20cd0e9..e387cc6dda 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -819,7 +819,7 @@ patterns are available: - `java` suitable for source code in the Java language. -- `matlab` suitable for source code in the MATLAB language. +- `matlab` suitable for source code in the MATLAB and Octave languages. - `objc` suitable for source code in the Objective-C language. |