diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-03-23 14:09:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-23 14:09:29 -0700 |
| commit | 3ece3cb865d55a506bd7b927d7dd824c77972029 (patch) | |
| tree | e180d56549e3e35192b508ceaf52fca3af6e78d8 /Documentation/gitattributes.txt | |
| parent | Merge branch 'bc/block-sha1-without-gcc-asm-extension' (diff) | |
| parent | userdiff: add builtin diff driver for kotlin language. (diff) | |
| download | tgif-3ece3cb865d55a506bd7b927d7dd824c77972029.tar.xz | |
Merge branch 'jd/userdiff-kotlin'
A new built-in userdiff driver for kotlin.
* jd/userdiff-kotlin:
userdiff: add builtin diff driver for kotlin language.
Diffstat (limited to 'Documentation/gitattributes.txt')
| -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 a71dad2674..4b36d51beb 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -829,6 +829,8 @@ patterns are available: - `java` suitable for source code in the Java language. +- `kotlin` suitable for source code in the Kotlin language. + - `markdown` suitable for Markdown documents. - `matlab` suitable for source code in the MATLAB and Octave languages. |