X-Git-Url: https://git.ladys.computer/Status/blobdiff_plain/d1f61cae690e87cf2a64747b788eb1d9285f17f8..9e6b199649c5832895151703e15b3937b96e6e12:/Makefile?ds=inline

diff --git a/Makefile b/Makefile
index 6e6d778..e37aad5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,29 @@
-USERNAME := USERNAME
-DOMAIN := DOMAIN
-GIT_REPOSITORY := /home/$(USERNAME)/Status.git
+X_STATUS_GIT = https://git.ladys.computer/x_status_git.git
+
+update: FIRST_COMMIT = $(shell git rev-list --max-parents=0 live)
 
 nothing:
 	@echo 'Type `make remote` to update the remote post-receive script.'
 
+update:
+	git pull
+	git remote add upstream $(X_STATUS_GIT)
+	git fetch upstream
+	git checkout --detach upstream/current
+	git reset --soft $(FIRST_COMMIT)
+	git commit --amend --no-edit
+	git tag base
+	git checkout live
+	git rebase --onto base $(FIRST_COMMIT)
+	git tag --delete base
+	git remote remove upstream
+
+clean:
+	git remote remove upstream || true
+	git tag --delete base || true
+	git checkout live
+
 remote:
-	scp post-receive $(USERNAME)@$(DOMAIN):$(GIT_REPOSITORY)/hooks/post-receive
+	scp post-receive computer:/srv/git/Status/hooks/post-receive
 
-.PHONY: nothing remote ;
+.PHONY: nothing remote update clean ;