From f139510a51b7450898a9c83c2c737bb09f7bb6ad Mon Sep 17 00:00:00 2001 From: Felix Kauselmann Date: Tue, 7 Aug 2018 11:02:26 +0200 Subject: [PATCH] Update .gitattributes to cover all text files * text=auto does not affect files that already have been commited as CRLF. We need to explicitely set the text attributes for these files to enable line conversion. --- .gitattributes | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.gitattributes b/.gitattributes index b1bd83ff..cc8ed424 100644 --- a/.gitattributes +++ b/.gitattributes @@ -34,6 +34,7 @@ *.tab text *.tsv text *.sql text +*.txt text # Graphics *.png binary @@ -43,6 +44,7 @@ *.tif binary *.tiff binary *.ico binary +*.icns binary # SVG treated as an asset (binary) by default. If you want to treat it as text, # comment-out the following line and uncomment the line after. *.svg binary @@ -50,8 +52,10 @@ *.eps binary # Sources +*.bat text eol=crlf *.c text *.cc text +*.css text *.cxx text *.cpp text *.c++ text @@ -59,7 +63,26 @@ *.h text *.h++ text *.hh text +*.html text +*.m text +*.mm text +*.patch text +*.sh text eol=lf +*.tpl text + +# Qt specific +*.qm text *.qml text +*.qrc text +*.pro text +*.pri text +*.rc text +*.ts text +*.qm text + +# Git +.gitignore text +.gitattributes text # Compiled Object files *.slo binary