mirror of
https://github.com/cmur2/python-veml6070.git
synced 2024-12-21 14:54:23 +01:00
module: add Make target for rebasing three branch
This commit is contained in:
parent
cee37093e2
commit
2cf9c87a8d
11
Makefile
11
Makefile
@ -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}'
|
||||||
|
Loading…
Reference in New Issue
Block a user