diff options
| author | kennytm <kennytm@gmail.com> | 2018-05-16 23:49:58 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-05-16 23:49:58 +0800 |
| commit | 2d46b9032a20a92baf674de22c075f690307425a (patch) | |
| tree | a9e945f41adac2355c63d90fd376336632017f34 /.gitattributes | |
| parent | 2a3f5367a23a769a068c37460db336de427c4b48 (diff) | |
| download | rust-2d46b9032a20a92baf674de22c075f690307425a.tar.gz rust-2d46b9032a20a92baf674de22c075f690307425a.zip | |
GitHub: Stop treating Cargo.lock as a generated file.
We do want to inspect the changes to Cargo.lock, hiding the diff by default would miss important details like https://github.com/rust-lang/rust/pull/50629#discussion_r187556602
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 2b4f3d47263..7f25bddc06c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,4 +7,4 @@ src/etc/installer/gfx/* binary *.woff binary src/vendor/** -text -Cargo.lock -merge +Cargo.lock -merge linguist-generated=false |