diff --git a/Makefile b/Makefile index d052787..f5ca9c1 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,6 @@ include .gitlab/make/git.makefile include .gitlab/make/kubectl.makefile # git subtree add --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main -# git reset head~1 .PHONY: make-update make-update: @git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git $(MAKE_BRANCH) - @git reset head~1