summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorfpi2020-08-23 13:06:36 +0200
committerfpi2020-08-23 13:09:12 +0200
commitcfeec023d5a401756773657cf3f86aacaca87c0b (patch)
tree87f8ba747653f21b69b6c8c3484091ab70b889d6 /Makefile
parentCreate directory to save hashes if it does not exist (diff)
Add make target for dev+ branch
Diffstat (limited to '')
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d381bbf..db682d6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,16 @@
dst_readme := tangle.sh merge.sh pull.sh link.sh dots.sh
-.PHONY: merge install link tangle fetch pull clean
+.PHONY: merge dev install link tangle fetch pull clean
merge: tangle/merge.sh
tangle/merge.sh
+dev:
+ git fetch
+ git rebase origin/dev+ dev+
+ git rebase master dev+
+ git push --force origin dev+
+
install: tangle link
tangle: tangle/tangle.sh