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})