Skip to content

Commit

Permalink
Rollup merge of rust-lang#83208 - jethrogb:jb/gitignore, r=Xanewok
Browse files Browse the repository at this point in the history
Fix gitattibutes for old git versions
  • Loading branch information
Dylan-DPC authored Mar 18, 2021
2 parents 8dbc59d + b1de9d4 commit d12cfc9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
*.fixed linguist-language=Rust
*.mir linguist-language=Rust
src/etc/installer/gfx/* binary
*.woff binary
*.woff2 binary
src/vendor/** -text
Cargo.lock linguist-generated=false

# Older git versions try to fix line endings on images, this prevents it.
# Older git versions try to fix line endings on images and fonts, this prevents it.
*.png binary
*.ico binary
*.woff binary
*.woff2 binary

0 comments on commit d12cfc9

Please sign in to comment.