From 257152989e1c9fc8a7ba201fee7614757b59415a Mon Sep 17 00:00:00 2001 From: Jannik Zander Date: Sun, 6 Nov 2016 21:30:14 +0100 Subject: [PATCH] Problem crlf --- .config/git/attributes | 2 +- .config/git/config | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.config/git/attributes b/.config/git/attributes index bda67e7..2cbeb8d 100644 --- a/.config/git/attributes +++ b/.config/git/attributes @@ -11,7 +11,7 @@ # Text files with fixed EOL=CRLF$ *.bat text eol=CRLF *.ahk text eol=crlf -*.vcproj text eol=crlf +#*.vcproj text eol=crlf # Binary files *.reg binary diff --git a/.config/git/config b/.config/git/config index 6445656..932f23c 100644 --- a/.config/git/config +++ b/.config/git/config @@ -95,5 +95,10 @@ excludesfile = ~/.config/git/ignore attributesFile = ~/.config/git/attributes editor = vim + autocrlf = false + safecrlf = true [include] path = ~/.config/git/config_local +[user] + name = Jannik Zander + email = jannikz@gmail.com -- 2.43.0