From dde190df3f2913b7eba853cd6a50ed989960950e Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Sun, 12 Aug 2018 17:42:23 +0200 Subject: [PATCH] no more clrf in git --- .gitconfig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitconfig b/.gitconfig index db2e11b..d867938 100644 --- a/.gitconfig +++ b/.gitconfig @@ -15,8 +15,10 @@ ktokurwa = blame [push] - default = simple + default = simple + [merge "ours"] - driver = true + driver = true + [core] - autocrlf = input + excludesfile = ~/.gitignore