Try 1 get all line ends the same.

Yapeal · Dec 31, 2014 · abcd57f · abcd57f
1 parent 3f77693
commit abcd57f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,28 +1,32 @@
 # Set default behaviour, in case users don't have core.autocrlf set.
-* text eol=crlf
+* text eol=lf
 
 # Explicitly declare text files we want to always be normalized and converted
 # to native line endings on checkout.
 #*.c text
 #*.h text
 
 # Declare files that will always have CRLF line endings on checkout.
-*.ini text eol=crlf
-*.md text eol=crlf
 *.txt text eol=crlf
-*.yaml text eol=crlf
-LICENSE text eol=crlf
-README text eol=crlf
 
 # Declare files that will always have LF line endings on checkout.
+.gitattributes text eol=lf
+.gitignore text eol=lf
 *.crt text eol=lf
+*.ini text eol=lf
 *.json text eol=lf
+*.md text eol=lf
 *.pem text eol=lf
 *.php text eol=lf
 *.sql text eol=lf
 *.xml text eol=lf
 *.xsd text eol=lf
 *.xsl text eol=lf
+*.yaml text eol=lf
+*.yml text eol=lf
+phpunit.xml.dist text eol=lf
+LICENSE text eol=lf
+README text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
 *.gif binary

diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@ bin/sql/createCustomTables.sql
 composer.lock
 config/yapeal.ini
 config/yapeal.yaml
-log/*.log
+*.log
 .idea/
 cache/
 docs/