diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:39 -0700 |
| commit | d49c2c3466d2c8cb0b3d0a43e6b406b07078fdb1 (patch) | |
| tree | 649dae8fbfe6951521ee612cfe964ba266dd929b /Documentation | |
| parent | 2743b61bc65156d337c0740da5122b58a044b1a5 (diff) | |
| parent | 3c81760bc66376c3ac69c39475cbe3b13e97e798 (diff) | |
| download | git-d49c2c3466d2c8cb0b3d0a43e6b406b07078fdb1.tar.xz | |
Merge branch 'sb/userdiff-dts'
Device-tree files learned their own userdiff patterns.
* sb/userdiff-dts:
userdiff: add a builtin pattern for dts files
Diffstat (limited to 'Documentation')
| -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 fb1d188d44..c5a528c667 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -810,6 +810,8 @@ patterns are available: - `css` suitable for cascading style sheets. +- `dts` suitable for devicetree (DTS) files. + - `fortran` suitable for source code in the Fortran language. - `fountain` suitable for Fountain documents. |