git.mk

.PHONY: commit
commit: ## Commit changes to git, push them to the remote and inform flux about it
	git commit -v
	git push
	make flux-update-git

merge:
	git fetch
	git merge --no-ff origin/$(BRANCH) --no-edit
	git push
	git push origin --delete $(BRANCH)