summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfpi2020-09-21 09:42:05 +0200
committerfpi2020-09-27 12:22:55 +0200
commitd511e2d575505d8513ce70c646108a4616951fa0 (patch)
tree0eb040eb9c5b17dce6253c2120dc78d1e77aec55
parentAdd make target for dev+ branch (diff)
Add update target to combine pull and dev
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index db682d6..8f504ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,12 @@
dst_readme := tangle.sh merge.sh pull.sh link.sh dots.sh
-.PHONY: merge dev install link tangle fetch pull clean
+.PHONY: merge update dev install link tangle fetch pull clean
merge: tangle/merge.sh
tangle/merge.sh
+update: pull dev
+
dev:
git fetch
git rebase origin/dev+ dev+