diff options
| -rw-r--r-- | Makefile | 7 | 
1 files changed, 4 insertions, 3 deletions
@@ -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+  | 
