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