diff --git a/Makefile b/Makefile index 1575e0d..d431a5e 100644 --- a/Makefile +++ b/Makefile @@ -8,3 +8,9 @@ include .gitlab/make/docker.makefile include .gitlab/make/helm.makefile include .gitlab/make/kaniko.makefile include .gitlab/make/truenas.makefile + +.PHONY: make-update +make-update: + @git stash + @git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash + @git stash pop diff --git a/README.md b/README.md index 1d084b1..8aa1cbe 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,8 @@ ```bash # Add the subtree as a remote -git remote add common git@gitlab.ducoterra.net:services/common.git -git subtree add --prefix .gitlab common main +git subtree add --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash # Now you can run the following to update -git subtree pull --prefix .gitlab common main +make make-update ```