summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Lemon <y@yulqen.org>2024-05-03 12:22:31 +0100
committerMatthew Lemon <y@yulqen.org>2024-05-03 12:22:31 +0100
commit64ca26bf69fd9eca5d71856646438eb9bf8f827f (patch)
treed47af5c9a0404efac53e61d9739d54f0ab92cb8b /Makefile
parent662cc1ff4e4b184ed9f60a13676ce6a96017ff6b (diff)
Adds git sync command to Makefile
Diffstat (limited to '')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 7468e39..556e2ba 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@ runserver-docker:
docker run -it --name ded -d --rm -p 8000:8000 ded:latest
runserver-docker-with-vol:
docker run -it --name ded -d --rm -p 8000:8000 -v $(PWD):/app ded:latest
+sync:
+ git pull && git checkout main && git pull && git merge pyswitch && git checkout pyswitch && git rebase main && git push
build:
docker build -t ded:latest .
test: