aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorJaydeep P Das <jaydeepjd.8914@gmail.com>2022-03-12 10:18:32 +0530
committerJunio C Hamano <gitster@pobox.com>2022-03-12 18:15:47 -0800
commit09188ed930bcb08e56d1846fbf9f5cb972a2d188 (patch)
treeb4fec1636c1447a69ad3527ffb3edb456802ce7b /Documentation/gitattributes.txt
parent715d08a9e51251ad8290b181b6ac3b9e1f9719d7 (diff)
downloadgit-09188ed930bcb08e56d1846fbf9f5cb972a2d188.tar.gz
userdiff: add builtin diff driver for kotlin language.
The xfuncname pattern finds func/class declarations in diffs to display as a hunk header. The word_regex pattern finds individual tokens in Kotlin code to generate appropriate diffs. This patch adds xfuncname regex and word_regex for Kotlin language. Signed-off-by: Jaydeep P Das <jaydeepjd.8914@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt2
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.