diff --git a/utils/git.mk b/utils/git.mk index dece38bf7e98bcb6b44e44a1b97f1549881ba6e1..2ec04aa25e8c4eebda3bd83fd3fd99afc8461a2a 100644 --- a/utils/git.mk +++ b/utils/git.mk @@ -3,3 +3,8 @@ commit: ## Commit changes to git, push them to the remote and inform flux about git commit -v git push make flux-update-git + +merge: + git fetch + git merge --no-ff origin/$(BRANCH) --no-edit + git push origin --delete $(BRANCH)