From 91b77b3d31ccd68244ac3fd75e71d0f74e8fbc02 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sun, 12 Dec 2021 19:26:02 -0500 Subject: [PATCH] don't reset head after subtree pull, it breaks things --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index d052787..f5ca9c1 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,6 @@ include .gitlab/make/git.makefile include .gitlab/make/kubectl.makefile # git subtree add --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main -# git reset head~1 .PHONY: make-update make-update: @git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git $(MAKE_BRANCH) - @git reset head~1