diff options
| author | kennytm <kennytm@gmail.com> | 2018-05-17 05:24:42 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-05-17 05:24:42 +0800 |
| commit | 3c261a4ea9d931d6af8562ab3c669a64cbf2c023 (patch) | |
| tree | fa9a013995d761a80501d4f5aa155fcf25ee54ef | |
| parent | 8366780164d062c6cb69d0243e9fcf85a37d548f (diff) | |
| parent | 2d46b9032a20a92baf674de22c075f690307425a (diff) | |
Rollup merge of #50809 - kennytm:show-cargo-lock-diff, r=alexcrichton
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 make it easier to miss important details like https://github.com/rust-lang/rust/pull/50629#discussion_r187556602 and https://github.com/rust-lang/rust/pull/50696#pullrequestreview-119648156
| -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 |