Renormalize

diff --git a/.gitattributes b/.gitattributes
index e8b69beee4eeb68b98bacf03fb046ba0e28323de..479116989cc2c44151145ac61ca19b0987947b79 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,21 +1,21 @@
 # Default
-*           text=auto
+*           text=auto   !eol
 
 # Text files that should be normalized (CRLF => LF)
-#*.c         text
-#*.h         text
-#*.md        text
-#*.txt       text
+*.c         text
+*.h         text
+*.md        text
+*.txt       text
 
 # Text files with fixed EOL=LF
-#*.sh        text eol=LF
+*.sh        text eol=LF
 
 # Text files with fixed EOL=CRLF$
-#*.bat       text eol=CRLF
-#*.ahk       text eol=crlf
-#*.vcproj    text eol=crlf
+*.bat       text eol=CRLF
+*.ahk       text eol=crlf
+*.vcproj    text eol=crlf
 
 # Binary files
-#*.jpg       -text
-#*.exe       -text 
-#*.reg       -text 
+*.jpg       -text
+*.exe       -text 
+*.reg       -text 

diff --git a/.gitconfig b/.gitconfig
index 03c5f8d7b4b58d92242a996fc2d888494e057184..66a7eff21e3bffef3d6af20e70eda71c1a28e6d1 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,6 +6,7 @@
        pager = less
        quotepath = false
        commitGraph = true
+       autocrlf = false
 [help]
        autocorrect = 10
 [branch]
@@ -30,10 +31,10 @@
 [mergetool "vimdiff"]
        prompt = false
 [difftool "bc"]
- path = c:/Program Files/Beyond Compare 4/bcomp.exe
+       path = C:/Program Files/Beyond Compare 4/bcomp.exe
        trustExitCode = false
 [mergetool "bc"]
- path = c:/Program Files/Beyond Compare 4/bcomp.exe
+       path = C:/Program Files/Beyond Compare 4/bcomp.exe
        trustExitCode = false
 [init]
        templatedir = ~/.config/git/templates