diff --git a/config.d/git.bash b/config.d/git.bash index a8edc3d..165e785 100644 --- a/config.d/git.bash +++ b/config.d/git.bash @@ -2,28 +2,30 @@ # Configuration GIT -git config --global user.name "Xavier Logerais" -git config --global user.email "xavier@logerais.com" +# Now managed by chezmoi -git config --global credential.helper cache - -git config --global merge.conflictstyle diff3 -git config --global rerere.enabled 1 - -cat <~/.gitignore -### asdf ### -.tool-versions -### mise ### -.mise.toml -### direnv ### -.direnv -.envrc -### python ### -.venv -EOF - -cat <~/.gitattributes -EOF - -git config --global core.excludesfile ~/.gitignore -git config --global core.attributesfile ~/.gitattributes +# git config --global user.name "Xavier Logerais" +# git config --global user.email "xavier@logerais.com" +# +# git config --global credential.helper cache +# +# git config --global merge.conflictstyle diff3 +# git config --global rerere.enabled 1 +# +# cat <~/.gitignore +# ### asdf ### +# .tool-versions +# ### mise ### +# .mise.toml +# ### direnv ### +# .direnv +# .envrc +# ### python ### +# .venv +# EOF +# +# cat <~/.gitattributes +# EOF +# +# git config --global core.excludesfile ~/.gitignore +# git config --global core.attributesfile ~/.gitattributes