diff --git a/dotconf/gitconfig b/dotconf/gitconfig index e6197ac..aa7fa24 100644 --- a/dotconf/gitconfig +++ b/dotconf/gitconfig @@ -59,6 +59,7 @@ excludesfile = ~/.gitignore editor = vim [commit] + verbose = true gpgSign = true [tag] gpgSign = true @@ -70,3 +71,23 @@ [includeIf "gitdir:~/dev/scn/"] path = ~/dev/scn/.gitconfig + +[fetch] + prune = true + prunetags = true + fsckobjects = true + +[merge] + conflictstyle = diff3 + +[diff] + algorithm = histogram + +[rerere] + enabled = true + +[transfer] + fsckObjects = true + +[receive] + fsckObjects = true diff --git a/dotconf/profile b/dotconf/profile index ace1189..6da6f52 100644 --- a/dotconf/profile +++ b/dotconf/profile @@ -17,10 +17,12 @@ fi __path "$HOME/bin" __path "$HOME/.local/bin" __path "$HOME/go/bin" +__path "/usr/local/go/bin" __path "$HOME/.local/share/JetBrains/Toolbox/scripts" __path "$HOME/.config/composer/vendor/bin" __source "$HOME/.cargo/env" +__source "$HOME/.asdf/asdf.sh" unset __source unset __path