From d511e2d575505d8513ce70c646108a4616951fa0 Mon Sep 17 00:00:00 2001 From: fpi Date: Mon, 21 Sep 2020 09:42:05 +0200 Subject: Add update target to combine pull and dev --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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+ -- cgit v1.2.3