From 606b64e45449352bf1015f3b2cf80b3b48646cde Mon Sep 17 00:00:00 2001 From: Haowei Cai Date: Sun, 24 Oct 2021 20:51:46 -0700 Subject: [PATCH] Accept the automatically generated merge commit message --- scripts/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release.sh b/scripts/release.sh index 08251e8d5..d19dc6a11 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -137,7 +137,7 @@ echo "New Kubernetes API Version: $new_k8s_api_version" # If it's an actual release, pull master branch if [[ $CLIENT_VERSION != *"snapshot"* ]]; then - git pull -X theirs upstream master + git pull -X theirs upstream master --no-edit # Collect release notes from master branch start_sha=$(git log upstream/release-19.0..upstream/master | grep ^commit | tail -n1 | sed 's/commit //g')