diff --git a/Makefile b/Makefile index 02f380c..320f9d4 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ make-stash-drop: @if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash drop; fi .PHONY: make-update -make-update: warning +make-update: @git stash save $(STASH) -git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash @if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash pop; fi