diff options
| author | bors <bors@rust-lang.org> | 2013-09-20 16:11:04 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-20 16:11:04 -0700 |
| commit | c29e76b2a31cfaed381c07e6047bffb861d3879d (patch) | |
| tree | 2a6ac735213b20ed5b29efa2826a46416833fef1 | |
| parent | a95604fcaacf9cbad5f57b8c08e1b3e871462e9c (diff) | |
| parent | 9e3258e51f14a2442b845949a9a31af22501e5c1 (diff) | |
| download | rust-c29e76b2a31cfaed381c07e6047bffb861d3879d.tar.gz rust-c29e76b2a31cfaed381c07e6047bffb861d3879d.zip | |
auto merge of #9371 : thestinger/rust/text, r=pnkfelix
We force the usage of LF line endings, but *only* in text files.
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 70b2a5cd90e..39221d3928e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ [attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4 -* text eol=lf +* text=auto eol=lf *.cpp rust *.h rust *.rs rust |