From b4cb3a93487181152160ba13b50ee12e353e2e43 Mon Sep 17 00:00:00 2001
From: fpi
Date: Wed, 14 Oct 2020 10:27:02 +0200
Subject: Expand update target to also merge and rebase

---
 Makefile | 7 ++++---
 1 file 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+
-- 
cgit v1.2.3