From 7e00684bda063261d3c533b86f0f9fb8063671a2 Mon Sep 17 00:00:00 2001 From: Karsten Bott Date: Fri, 3 Jul 2015 06:03:29 +0200 Subject: [PATCH] clrf --- .gitattributes | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 129d72b..c8b5fb0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,9 +1,13 @@ # Auto detect text files and perform LF normalization -* text=auto -# *.ps1 text -# *.psm text -# *.ps1 text eol=crlf -# *.psm* text eol=crlf +# * text=auto +*.txt text eol=crlf +*.ps1 text eol=crlf +*.psm1 text eol=crlf +*.psd1 text eol=crlf +*.cmd text eol=crlf +*.md text eol=crlf +*.xml text merge=union + # labbuildr.ps1 text eol=crlf # Custom for Visual Studio