diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-25 15:03:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-25 15:04:05 (GMT) |
| commit | a749fcb3d0f788b85be0531ffe7e7ec2aaf7f9fa (patch) | |
| tree | 5f8807a67c4b5d6059fb13fc884c47ce7b7fe3fe /.gitattributes | |
| parent | 9538d22d955a0b101548019003f2d5c7ba833d77 (diff) | |
| parent | 8ed03baa766b1170bcfa0574525dc16106bf5b5f (diff) | |
| download | CMake-a749fcb3d0f788b85be0531ffe7e7ec2aaf7f9fa.zip CMake-a749fcb3d0f788b85be0531ffe7e7ec2aaf7f9fa.tar.gz CMake-a749fcb3d0f788b85be0531ffe7e7ec2aaf7f9fa.tar.bz2 | |
Merge topic 'modernize-git-whitespace-attributes'
8ed03baa gitattributes: prefer `eol=crlf` to `-crlf`
40470031 MumpsCoverage: remove unnecessary attribute
d20485d8 gitattributes: prefer `eol=lf` to `crlf=input`
b85c2589 gitattributes: prefer `-text` for binary files
377f3685 gitattributes: remove unused attributes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1173
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/.gitattributes b/.gitattributes index 3829160..fd878ac 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,20 +8,19 @@ # Do not perform whitespace checks. Do not format. [attr]generated whitespace=-tab-in-indent,-indent-with-non-tab -format.clang-format -bootstrap crlf=input -configure crlf=input -*.[1-9] crlf=input -*.sh crlf=input -*.sh.in crlf=input +bootstrap eol=lf +configure eol=lf +*.[1-9] eol=lf +*.sh eol=lf +*.sh.in eol=lf -*.bat -crlf -*.bat.in -crlf -*.dsp -crlf -*.dsw -crlf -*.pfx -crlf -*.png -crlf -*.sln -crlf -*.vcproj -crlf +*.bat eol=crlf +*.bat.in eol=crlf +*.sln eol=crlf +*.vcproj eol=crlf + +*.pfx -text +*.png -text *.c our-c-style *.cc our-c-style |