laily/.dotfile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: modify sub gitconfig

Browse Source
This commit is contained in:
laily
2023-03-21 14:48:19 +08:00
parent 1fd0cdaf63
commit 83dbf07703
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.zshrc
+2 -1
View File
@@ -115,7 +115,7 @@ export HOMEBREW_NO_AUTO_UPDATE=true # 禁止 brew 每次安装软件都 upate
export REVIEW_BASE="master" export REVIEW_BASE="master"
# go # go
export GOPATH=$HOME/go export GOPATH=$HOME/go:$HOME/workrepo/go
export PATH=$PATH:$GOPATH/bin export PATH=$PATH:$GOPATH/bin
export GOPROXY=goproxy.cn export GOPROXY=goproxy.cn
export GOSUMDB="sum.golang.google.cn" export GOSUMDB="sum.golang.google.cn"
@@ -124,6 +124,7 @@ export GOSUMDB="sum.golang.google.cn"
[ -f ~/.zprofile ] && source ~/.zprofile [ -f ~/.zprofile ] && source ~/.zprofile
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
test -e /home/linuxbrew/.linuxbrew/ && export PATH=$PATH:/home/linuxbrew/.linuxbrew/bin test -e /home/linuxbrew/.linuxbrew/ && export PATH=$PATH:/home/linuxbrew/.linuxbrew/bin
test -e ~/.pri_scripts && export PATH=$PATH:~/.pri_scripts
# add z # add z
if command -v lua >/dev/null; then if command -v lua >/dev/null; then
git/.gitconfig
+2 -2
View File
@@ -10,8 +10,8 @@
default = current default = current
[merge] [merge]
tool = vimdiff tool = vimdiff
[include] [includeIf "gitdir:~/workrepo"]
path = ~/.subgitconfig path = ~/.workgitconfig
[branch] [branch]
autoSetupMerge = always autoSetupMerge = always
[alias] [alias]