Add system go path, tweak git
This commit is contained in:
parent
598439b3f9
commit
d5c96d75a1
2 changed files with 23 additions and 0 deletions
|
@ -59,6 +59,7 @@
|
||||||
excludesfile = ~/.gitignore
|
excludesfile = ~/.gitignore
|
||||||
editor = vim
|
editor = vim
|
||||||
[commit]
|
[commit]
|
||||||
|
verbose = true
|
||||||
gpgSign = true
|
gpgSign = true
|
||||||
[tag]
|
[tag]
|
||||||
gpgSign = true
|
gpgSign = true
|
||||||
|
@ -70,3 +71,23 @@
|
||||||
|
|
||||||
[includeIf "gitdir:~/dev/scn/"]
|
[includeIf "gitdir:~/dev/scn/"]
|
||||||
path = ~/dev/scn/.gitconfig
|
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
|
||||||
|
|
|
@ -17,10 +17,12 @@ fi
|
||||||
__path "$HOME/bin"
|
__path "$HOME/bin"
|
||||||
__path "$HOME/.local/bin"
|
__path "$HOME/.local/bin"
|
||||||
__path "$HOME/go/bin"
|
__path "$HOME/go/bin"
|
||||||
|
__path "/usr/local/go/bin"
|
||||||
__path "$HOME/.local/share/JetBrains/Toolbox/scripts"
|
__path "$HOME/.local/share/JetBrains/Toolbox/scripts"
|
||||||
__path "$HOME/.config/composer/vendor/bin"
|
__path "$HOME/.config/composer/vendor/bin"
|
||||||
|
|
||||||
__source "$HOME/.cargo/env"
|
__source "$HOME/.cargo/env"
|
||||||
|
__source "$HOME/.asdf/asdf.sh"
|
||||||
|
|
||||||
unset __source
|
unset __source
|
||||||
unset __path
|
unset __path
|
||||||
|
|
Loading…
Reference in a new issue