summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-06-20 11:01:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-20 11:01:02 -0700
commit8699b74ae1190b90facdbe83a879251c8a9e07ac (patch)
treef92ce3547ca3bdd0e39ae3e245489dce74489b93 /Documentation
parentMerge branch 'jc/clear-pathspec' (diff)
parentuserdiff: add built-in pattern for CSS (diff)
downloadtgif-8699b74ae1190b90facdbe83a879251c8a9e07ac.tar.xz
Merge branch 'wd/userdiff-css'
Update the funcname definition to support css files. * wd/userdiff-css: userdiff: add built-in pattern for CSS
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitattributes.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index e3b1de8033..8882a3e914 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -525,6 +525,8 @@ patterns are available:
- `csharp` suitable for source code in the C# language.
+- `css` suitable for cascading style sheets.
+
- `fortran` suitable for source code in the Fortran language.
- `fountain` suitable for Fountain documents.