Commit fdcc75e0 authored by Oliver Pinter's avatar Oliver Pinter
Browse files

HBSD: append the shortlog of merged commits to merge commit message


Signed-off-by: default avatarOliver Pinter <oliver.pinter@hardenedbsd.org>
parent 732a364d
......@@ -82,7 +82,7 @@ foreach line ( ${BRANCHES} )
foreach _remote_branch ( ${remote_branches} )
# merge specific branches to current branch
echo "==== merge ${_remote_branch} branch ====" |& ${TEE_CMD} ${LOGS}/${_branch}-${DATE}.log
(git merge ${branch} ${_remote_branch}) |& ${TEE_CMD} ${LOGS}/${_branch}-${DATE}.log
(git merge --log ${branch} ${_remote_branch}) |& ${TEE_CMD} ${LOGS}/${_branch}-${DATE}.log
if ( $? != 0 ) then
set err=1
set _mail_subject_prefix="[MERGE]"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment