fix: modify gitconfig

This commit is contained in:
2022-02-05 15:28:45 +08:00
parent 777096d908
commit 9ea4f9b6dc
2 changed files with 4 additions and 0 deletions
+1
View File
@@ -103,6 +103,7 @@ bindkey "^f" forward-word
# brew # brew
export HOMEBREW_NO_AUTO_UPDATE=true # 禁止 brew 每次安装软件都 upate export HOMEBREW_NO_AUTO_UPDATE=true # 禁止 brew 每次安装软件都 upate
# go
export GOPROXY=goproxy.cn export GOPROXY=goproxy.cn
export GOSUMDB="sum.golang.google.cn" export GOSUMDB="sum.golang.google.cn"
+3
View File
@@ -14,6 +14,7 @@
ap = add -p ap = add -p
br = branch br = branch
pl = pull pl = pull
pt = push origin --tags
merge2 = "!f() { git checkout $1 && git merge $2 && git checkout -; }; f" merge2 = "!f() { git checkout $1 && git merge $2 && git checkout -; }; f"
bg = "!f() { git branch | grep $1; }; f" bg = "!f() { git branch | grep $1; }; f"
delbr = "!f(){ git branch -D `git branch | grep \"\b$1\"`; };f" delbr = "!f(){ git branch -D `git branch | grep \"\b$1\"`; };f"
@@ -23,3 +24,5 @@
[merge] [merge]
tool = vimdiff tool = vimdiff