From a8ec6b83e29b55caaa6fa35f1ee0135268769263 Mon Sep 17 00:00:00 2001 From: Xavier Logerais Date: Fri, 20 Dec 2024 08:46:28 +0000 Subject: [PATCH] feat: improve git configuration --- config.d/git.bash | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/config.d/git.bash b/config.d/git.bash index 0e34f7f..a8edc3d 100644 --- a/config.d/git.bash +++ b/config.d/git.bash @@ -4,8 +4,11 @@ git config --global user.name "Xavier Logerais" git config --global user.email "xavier@logerais.com" -git config --global rerere.enabled 1 + +git config --global credential.helper cache + git config --global merge.conflictstyle diff3 +git config --global rerere.enabled 1 cat <~/.gitignore ### asdf ### @@ -19,4 +22,8 @@ cat <~/.gitignore .venv EOF +cat <~/.gitattributes +EOF + git config --global core.excludesfile ~/.gitignore +git config --global core.attributesfile ~/.gitattributes