diff --git a/Dockerfile b/Dockerfile index 9fe81582..79fd2409 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.11-alpine AS go +FROM golang:1.12-alpine AS go RUN apk update \ && apk upgrade \ diff --git a/zshrc b/zshrc index 0bda85d7..4d9fd42f 100755 --- a/zshrc +++ b/zshrc @@ -279,7 +279,7 @@ if type git >/dev/null 2>&1; then gfr(){ git fetch --prune; git reset --hard origin/$(tb); - git branch --merged | grep -vE '^\*|master$|develop$' | xargs -I % git branch -d % + git branch --merged | grep -vE '^\*|master$|develop$' | xargs -I % git branch -D % } alias gfr=gfr gfrs(){