Make user stash their own damn changes
Stashing is so annoying to deal with in a scripted way. Just force the user to stash their own changes. Only subtree pull if it's possible.
This commit is contained in:
4
Makefile
4
Makefile
@@ -24,9 +24,7 @@ make-stash-drop:
|
|||||||
|
|
||||||
.PHONY: make-update
|
.PHONY: make-update
|
||||||
make-update:
|
make-update:
|
||||||
@git stash save $(STASH)
|
@git subtree pull --prefix .gitlab --message "Merge update from Common" -q common main
|
||||||
-git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main
|
|
||||||
@if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash pop; fi
|
|
||||||
|
|
||||||
.PHONY: make-push
|
.PHONY: make-push
|
||||||
make-push: warning
|
make-push: warning
|
||||||
|
|||||||
Reference in New Issue
Block a user