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