bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Revert "Stop git from merging generated files"

Browse source 
This reverts commit 4cbb599edf.
"-merge" makes git not even do merges if they are entirely conflict-free,
which is not the behavior we want.
This commit is contained in:
Ralf Jung 2024-12-12 07:19:57 +01:00
parent 1f3bf231e1
commit 4a60706e61
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitattributes vendored
View file

@ -4,10 +4,8 @@
*.cpp rust *.cpp rust
*.h rust *.h rust
*.rs rust diff=rust *.rs rust diff=rust
*.fixed linguist-language=Rust -merge *.fixed linguist-language=Rust
*.mir linguist-language=Rust -merge *.mir linguist-language=Rust
*.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