diff options
| author | Oli Scherer <github333195615777966@oli-obk.de> | 2024-12-04 11:01:20 +0000 |
|---|---|---|
| committer | Oli Scherer <github333195615777966@oli-obk.de> | 2024-12-04 11:06:37 +0000 |
| commit | 4cbb599edf5b0762caa36ee4cbba00c5c86c1f5e (patch) | |
| tree | d94260c99a4e03ef94e7e12cee32c3fb0cfea58d /.gitattributes | |
| parent | 2633e019298f8d9f671c8f3d0d3348ce6fa1b8aa (diff) | |
| download | rust-4cbb599edf5b0762caa36ee4cbba00c5c86c1f5e.tar.gz rust-4cbb599edf5b0762caa36ee4cbba00c5c86c1f5e.zip | |
Stop git from merging generated files
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index d29c15fe712..a02c95fbd48 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,8 +4,10 @@ *.cpp rust *.h rust *.rs rust diff=rust -*.fixed linguist-language=Rust -*.mir linguist-language=Rust +*.fixed linguist-language=Rust -merge +*.mir linguist-language=Rust -merge +*.stderr -merge +*.stdout -merge src/etc/installer/gfx/* binary src/vendor/** -text Cargo.lock linguist-generated=false |