Browse Source

Update shared gitattributes to handle rogue exif pdf.

af/merge-core
James Jackson-South 7 years ago
parent
commit
9c4cd22749
  1. 10
      .gitattributes
  2. 2
      shared-infrastructure

10
.gitattributes

@ -64,13 +64,20 @@
# treat as binary # treat as binary
*.bmp binary *.bmp binary
*.dll binary *.dll binary
*.eot binary
*.exe binary *.exe binary
*.gif binary *.gif binary
*.jpg binary *.jpg binary
*.pdf binary
*.png binary *.png binary
*.tga binary *.ppt binary
*.pptx binary
*.ttf binary *.ttf binary
*.snk binary *.snk binary
*.woff binary
*.woff2 binary
*.xls binary
*.xlsx binary
# diff as plain text # diff as plain text
*.doc diff=astextplain *.doc diff=astextplain
*.docx diff=astextplain *.docx diff=astextplain
@ -78,6 +85,7 @@
*.pdf diff=astextplain *.pdf diff=astextplain
*.pptx diff=astextplain *.pptx diff=astextplain
*.rtf diff=astextplain *.rtf diff=astextplain
*.svg diff=astextplain
*.jpg filter=lfs diff=lfs merge=lfs -text *.jpg filter=lfs diff=lfs merge=lfs -text
*.jpeg filter=lfs diff=lfs merge=lfs -text *.jpeg filter=lfs diff=lfs merge=lfs -text
*.bmp filter=lfs diff=lfs merge=lfs -text *.bmp filter=lfs diff=lfs merge=lfs -text

2
shared-infrastructure

@ -1 +1 @@
Subproject commit faf84e44ec90e8a42a7271bcd04fea76279efb08 Subproject commit c2e689abe9227209e6d5bc4bf56255d92b4a5d62
Loading…
Cancel
Save