Browse Source

make: add helper to rebase local branches to incorporate upstream changes

master
Jim Paris 7 months ago
parent
commit
ad13bb343a
1 changed files with 8 additions and 0 deletions
  1. +8
    -0
      Makefile

+ 8
- 0
Makefile View File

@@ -31,6 +31,14 @@ test-setup:
#git ls-files -z | tar --null -T - -cf - | tar -C /tmp/test-borg -xvf -
/tmp/test-borg/initial-setup.sh

# Pull master and rebase "setup-$HOSTNAME" branch onto it
.PHONY: rebase
rebase:
git checkout master
git pull
git checkout -
git rebase master

.PHONY: clean
clean:
rm -f README.html

Loading…
Cancel
Save