diff options
| -rw-r--r-- | .gitattributes | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/.gitattributes b/.gitattributes index 0b6acf18..de58a12b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,22 +1,6 @@ # 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 +# Proper line endings for platform-specific scripts +*.sh text eol=lf +*.bat text eol=crlf |