diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -15,10 +15,11 @@ cmd: .PHONY: sync sync: - git remote prune upstream + git remote prune up + git remote prune sh git remote prune origin - git fetch --prune --all --tags --force - git rebase upstream/master master + git fetch --prune --tags --force up + git rebase up/master main .PHONY: test test: GOFLAGS=-vet=off @@ -75,5 +76,5 @@ x-website: @echo ">>> Rebuilding golang.org/x/website" cd ~/go/src/golang.org/x/website \ && git fetch --all --tags --prune \ - && git rebase upstream/master \ + && git rebase up/master \ && go install ./cmd/golangorg |