summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfpi2020-10-14 10:27:02 +0200
committerfpi2020-10-14 10:27:34 +0200
commitb4cb3a93487181152160ba13b50ee12e353e2e43 (patch)
tree06d7f1ddf122016d91d23c4152c19246b4ba2c59
parentAdd update target to combine pull and dev (diff)
Expand update target to also merge and rebase
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 8f504ea..7578e04 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
dst_readme := tangle.sh merge.sh pull.sh link.sh dots.sh
-.PHONY: merge update dev install link tangle fetch pull clean
+.PHONY: update merge dev install link tangle fetch pull clean
+
+update: pull merge dev
+ git rebase dev+ work+
merge: tangle/merge.sh
tangle/merge.sh
-update: pull dev
-
dev:
git fetch
git rebase origin/dev+ dev+