diff --git a/Makefile b/Makefile index 87513aa..9c79e9a 100644 --- a/Makefile +++ b/Makefile @@ -13,11 +13,11 @@ setup: start install-plugins install-plugins: docker exec natascha_grav php /app/www/public/bin/gpm install $(shell cat plugins.txt | tr '\n' ' ') -y -# User repo -deploy: +# Content (user repo) +content-push: git subtree push --prefix=user user-deploy main -pull-content: +content-pull: git subtree pull --prefix=user user-deploy main --squash # Server diff --git a/README.md b/README.md index 5a3fe08..9894a2a 100644 --- a/README.md +++ b/README.md @@ -68,8 +68,8 @@ This SSHes into the server and runs `scripts/server-install.sh`, which installs ### Deploying changes ``` -make deploy # push local user/ changes to the user repo on Gitea -make pull-content # pull editor's content changes back locally +make content-push # push local user/ changes to the user repo on Gitea +make content-pull # pull editor's content changes back locally ``` After `make deploy`, the Git Sync plugin on the server pulls the changes automatically via webhook.