From 318c19e5d7ac0fd5675a13652650faa8aced67f9 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 17 Aug 2023 10:02:09 +0000 Subject: [PATCH] Add merge comment for subtree --- podman.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.mk b/podman.mk index b75ffb4..02e0475 100644 --- a/podman.mk +++ b/podman.mk @@ -78,7 +78,7 @@ rm-image: ## some useful tasks during development ci-pull-upstream: ## pull latest shared .ci subtree - git stash && git subtree pull --prefix .ci ssh://git@git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash && git stash pop + git stash && git subtree pull --prefix .ci ssh://git@git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash -m "Merge latest ci-tools-lib" && git stash pop create-repo: ## create new AWS ECR public repository aws ecr-public create-repository --repository-name $(IMAGE) --region $(REGION)