From 5e8d0d23ffd7ca360fc2c76d7699df18b93bbf1a Mon Sep 17 00:00:00 2001 From: Jannik ZANDER Date: Sat, 1 Feb 2020 20:15:12 +0100 Subject: [PATCH] Renormalize --- .gitattributes | 24 ++++++++++++------------ .gitconfig | 5 +++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitattributes b/.gitattributes index e8b69be..4791169 100644 --- 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 03c5f8d..66a7eff 100644 --- 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 -- 2.43.0