docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2802 from jeanlaurent/smarter-change-log 

During release exclude merge commit from changelog
This commit is contained in:
David Gageot 2016-01-11 16:45:50 +01:00
parent 0e1bc6c7c6 4a4dbda360
commit 248596da8a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/release.sh
View File

@ -128,7 +128,7 @@ display "Generating github release"
cp -f script/release/github-release-template.md "${GITHUB_RELEASE_FILE}" cp -f script/release/github-release-template.md "${GITHUB_RELEASE_FILE}"
checkError "Can't find github release template" checkError "Can't find github release template"
CONTRIBUTORS=$(git log "${LAST_RELEASE_VERSION}".. --format="%aN" --reverse | sort | uniq | awk '{printf "- %s\n", $0 }') CONTRIBUTORS=$(git log "${LAST_RELEASE_VERSION}".. --format="%aN" --reverse | sort | uniq | awk '{printf "- %s\n", $0 }')
CHANGELOG=$(git log "${LAST_RELEASE_VERSION}".. --oneline) CHANGELOG=$(git log "${LAST_RELEASE_VERSION}".. --oneline | grep -v 'Merge pull request')
CHECKSUM="" CHECKSUM=""
for file in $(ls bin/docker-machine*); do for file in $(ls bin/docker-machine*); do