From 28ba22564be0efd18d2cc787415a5fc7eba97c41 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 14 Apr 2026 08:36:34 +0200 Subject: [PATCH] make: add merge target for "community" origin --- Mk/git.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Mk/git.mk b/Mk/git.mk index 3b1c899f55..5f0fec7c5d 100644 --- a/Mk/git.mk +++ b/Mk/git.mk @@ -134,6 +134,10 @@ push: @${GIT} push @${GIT} checkout ${CORE_MAIN} +merge: ${CORE_MAIN} + @${GIT} fetch community + @${GIT} merge community/${CORE_MAIN} + checkout: .for DIR in ${.CURDIR}/src .if exists(${DIR})