1
0
mirror of https://github.com/cmur2/python-bme280.git synced 2024-12-22 12:54:23 +01:00

module: add Make target for rebasing three branch

This commit is contained in:
cn 2020-08-14 11:44:53 +02:00
parent 2a069d5cd0
commit 6155338645

View File

@ -21,6 +21,17 @@ lint: ## Lint all source code
test: ## Run all tests test: ## Run all tests
poetry run pytest poetry run pytest
.PHONY: rebase-three-branch
rebase-three-branch: ## Rebase the py3 branch with master contents
git stash
git checkout master
git pull
git checkout three
git rebase -i origin/master
git push --force-with-lease
git checkout master
git stash pop
.PHONY: help .PHONY: help
help: ## Print this help text help: ## Print this help text
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-15s\033[0m %s\n", $$1, $$2}' @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-15s\033[0m %s\n", $$1, $$2}'