From 2e7d3a2708fe7302924c9e79bdf55e862be76051 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Mon, 1 Nov 2021 22:16:05 -0400 Subject: [PATCH] Don't stash on make-update Make the developer handle their own stash. It's such a pain. --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7bf884e..5b95b42 100644 --- a/Makefile +++ b/Makefile @@ -24,9 +24,7 @@ make-stash-drop: .PHONY: make-update 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 + -git subtree pull --prefix .gitlab --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main .PHONY: make-push make-push: warning @@ -34,4 +32,3 @@ make-push: warning @git remote add common git@gitlab.ducoterra.net:services/common.git @git subtree push --prefix .gitlab common main @git remote remove common - @make make-update