summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Boxuan Li <liboxuan@connect.hku.hk>2019-05-18 11:46:23 +0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-19 10:45:28 +0900
commit91bf382fcf51af04f25ba22e1b70ac13cce4bd0b (patch)
tree28e2bfad11e17276c3c03a8de38502b0ee50df9c /Documentation
parentGit 2.22-rc0 (diff)
downloadtgif-91bf382fcf51af04f25ba22e1b70ac13cce4bd0b.tar.xz
userdiff: add Octave
Octave pattern is almost the same as matlab, except that '%%%' and '##' can also be used to begin code sections, in addition to '%%' that is understood by both. Octave pattern is merged into Matlab pattern. Test cases for the hunk header patterns of matlab and octave under t/t4018 are added. Signed-off-by: Boxuan Li <liboxuan@connect.hku.hk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitattributes.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 4fb20cd0e9..e657a6b7b7 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 language.
- `objc` suitable for source code in the Objective-C language.