diff options
| author | fpi | 2020-09-21 09:42:05 +0200 |
|---|---|---|
| committer | fpi | 2020-09-27 12:22:55 +0200 |
| commit | d511e2d575505d8513ce70c646108a4616951fa0 (patch) | |
| tree | 0eb040eb9c5b17dce6253c2120dc78d1e77aec55 | |
| parent | Add make target for dev+ branch (diff) | |
Add update target to combine pull and dev
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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+ |