summaryrefslogtreecommitdiffstats
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-01 18:04:35 +0100
committerJunio C Hamano <gitster@pobox.com>2019-12-01 18:04:36 +0100
commit376e7309e142d4cc95343faa5afd78fc5e27a135 (patch)
tree875ef67a8a1cf895b282ae0910a6e91a493a2549 /Documentation/gitattributes.txt
parentMerge branch 'py/shortlog-list-options-for-log' (diff)
parentuserdiff: add Elixir to supported userdiff languages (diff)
downloadgit-376e7309e142d4cc95343faa5afd78fc5e27a135.tar.xz
git-376e7309e142d4cc95343faa5afd78fc5e27a135.zip
Merge branch 'ln/userdiff-elixir'
The patterns to detect function boundary for Elixir language has been added. * ln/userdiff-elixir: userdiff: add Elixir to supported userdiff languages
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 88b82b5252..508fe713c4 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -812,6 +812,8 @@ patterns are available:
- `dts` suitable for devicetree (DTS) files.
+- `elixir` suitable for source code in the Elixir language.
+
- `fortran` suitable for source code in the Fortran language.
- `fountain` suitable for Fountain documents.