Skip to content
Snippets Groups Projects
Verified Commit caba5800 authored by Sheogorath's avatar Sheogorath :european_castle:
Browse files

chore(utils): Add merge function to make

parent 21ea338e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 0 deletions
utils/git.mk
+ 5
− 0
View file @ caba5800
...@@ -3,3 +3,8 @@ commit: ## Commit changes to git, push them to the remote and inform flux about ...@@ -3,3 +3,8 @@ commit: ## Commit changes to git, push them to the remote and inform flux about
git commit -v git commit -v
git push git push
make flux-update-git make flux-update-git
merge:
git fetch
git merge --no-ff origin/$(BRANCH) --no-edit
git push origin --delete $(BRANCH)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment