Skip to content

Commit e0989b4

Browse files
committed
Avoid text without auto to prevent complaining about mix of crlf/lf
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
1 parent 341a51b commit e0989b4

File tree

1 file changed

+1
-69
lines changed

1 file changed

+1
-69
lines changed

.gitattributes

Lines changed: 1 addition & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,8 @@
1-
# Common settings that generally should always be used with your language specific settings
2-
31
# Auto detect text files and perform LF normalization
42
* text=auto
53

6-
#
7-
# The above will handle all files NOT found below
8-
#
9-
104
# Documents
11-
*.bibtex text diff=bibtex
12-
*.doc diff=astextplain
13-
*.DOC diff=astextplain
14-
*.docx diff=astextplain
15-
*.DOCX diff=astextplain
16-
*.dot diff=astextplain
17-
*.DOT diff=astextplain
18-
*.pdf diff=astextplain
19-
*.PDF diff=astextplain
20-
*.rtf diff=astextplain
21-
*.RTF diff=astextplain
22-
*.md text diff=markdown
23-
*.mdx text diff=markdown
24-
*.tex text diff=tex
25-
*.adoc text
26-
*.textile text
27-
*.mustache text
285
*.csv text eol=crlf
29-
*.tab text
30-
*.tsv text
31-
*.txt text
32-
*.sql text
33-
*.epub diff=astextplain
346

357
# Graphics
368
*.png binary
@@ -40,7 +12,6 @@
4012
*.tif binary
4113
*.tiff binary
4214
*.ico binary
43-
*.svg text
4415
*.eps binary
4516

4617
# Fonts
@@ -55,19 +26,12 @@
5526
*.ksh text eol=lf
5627
*.sh text eol=lf
5728
*.zsh text eol=lf
29+
5830
# These are explicitly windows files and should use crlf
5931
*.bat text eol=crlf
6032
*.cmd text eol=crlf
6133
*.ps1 text eol=crlf
6234

63-
# Serialisation
64-
*.json text
65-
*.toml text
66-
*.xml text
67-
*.xsd text
68-
*.yaml text
69-
*.yml text
70-
7135
# Archives
7236
*.7z binary
7337
*.bz binary
@@ -95,42 +59,10 @@
9559
#
9660
# Exclude files from exporting
9761
#
98-
9962
.gitattributes export-ignore
10063
.gitignore export-ignore
10164
.gitkeep export-ignore
10265

103-
# Java sources
104-
*.java text diff=java
105-
*.kt text diff=kotlin
106-
*.groovy text diff=java
107-
*.scala text diff=java
108-
*.gradle text diff=java
109-
*.gradle.kts text diff=kotlin
110-
*.form text
111-
*.classpath text
112-
*.vmoptions text
113-
114-
# These files are text and should be normalized (Convert crlf => lf)
115-
*.css text diff=css
116-
*.scss text diff=css
117-
*.sass text
118-
*.df text
119-
*.htm text diff=html
120-
*.html text diff=html
121-
*.js text
122-
*.mjs text
123-
*.cjs text
124-
*.jsp text
125-
*.jspf text
126-
*.jspx text
127-
*.properties text
128-
*.tld text
129-
*.tag text
130-
*.tagx text
131-
*.xml text
132-
*.hl7 text
133-
13466
# These files are binary and should be left untouched
13567
# (binary is a macro for -text -diff)
13668
*.class binary

0 commit comments

Comments
 (0)