From 4e65be31b0916e18515357cf08eb1ade78596cb5 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 26 Mar 2021 08:50:20 +0100 Subject: [PATCH] make: add rebase target for stable branch --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index b0b8b2848..d4ede9f87 100644 --- a/Makefile +++ b/Makefile @@ -462,6 +462,11 @@ stable: master: @git checkout master +rebase: + @git checkout stable/${CORE_ABI} + @git rebase -i + @git checkout master + test: want-phpunit7-php${CORE_PHP} @if [ "$$(${PKG} query %n-%v ${CORE_NAME})" != "${CORE_NAME}-${CORE_PKGVERSION}" ]; then \ echo "Installed version does not match, expected ${CORE_NAME}-${CORE_PKGVERSION}"; \