Stop git from merging generated files
This commit is contained in:
parent
2633e01929
commit
4cbb599edf
1 changed files with 4 additions and 2 deletions
6
.gitattributes
vendored
6
.gitattributes
vendored
|
@ -4,8 +4,10 @@
|
||||||
*.cpp rust
|
*.cpp rust
|
||||||
*.h rust
|
*.h rust
|
||||||
*.rs rust diff=rust
|
*.rs rust diff=rust
|
||||||
*.fixed linguist-language=Rust
|
*.fixed linguist-language=Rust -merge
|
||||||
*.mir linguist-language=Rust
|
*.mir linguist-language=Rust -merge
|
||||||
|
*.stderr -merge
|
||||||
|
*.stdout -merge
|
||||||
src/etc/installer/gfx/* binary
|
src/etc/installer/gfx/* binary
|
||||||
src/vendor/** -text
|
src/vendor/** -text
|
||||||
Cargo.lock linguist-generated=false
|
Cargo.lock linguist-generated=false
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue