mirror of
https://github.com/opnsense/core.git
synced 2026-05-28 04:34:51 -04:00
make: add merge target for "community" origin
This commit is contained in:
parent
ae326511d1
commit
28ba22564b
1 changed files with 4 additions and 0 deletions
|
|
@ -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})
|
||||
|
|
|
|||
Loading…
Reference in a new issue