diff options
| author | Bill Parker <wp02855@gmail.com> | 2012-09-04 09:58:28 -0700 |
|---|---|---|
| committer | Bill Parker <wp02855@gmail.com> | 2012-09-04 09:58:28 -0700 |
| commit | c88b482ebc88a08030feda9212e9553fd2d0638e (patch) | |
| tree | e4a16b5e598ca268e669538d47eebbc90a833910 /.gitattributes | |
| parent | 477fe09d005dd951c6404f843a75811fdc993167 (diff) | |
| download | tcpdump-c88b482ebc88a08030feda9212e9553fd2d0638e.tar.gz | |
Added options to gitattributes
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..6a390401 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,26 @@ +# manage core stuff for LF normalization +core.autocrlf=true + +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain +#unix/linux stuff (tarballs) |