increment_version.sh: Exclude more merge commits from changelog

Change-Id: Iaaeccb73d0c4b0256b4c7211c3153a639a77eaf7
2021-08-02 13:59:41 +02:00 · 2021-08-02 13:59:41 +02:00 · b58f9cedbd
parent 2db315219a
commit b58f9cedbd
1 changed files with 1 additions and 1 deletions
--- a/increment_version.sh
+++ b/increment_version.sh
@ -146,7 +146,7 @@ git_changelog() {
        | grep -v 'Automatic revert to unchanged upstream strings' \
        | grep -v 'Automatic upstream merge preparation' \
        | sed "s|Merge tag '\\(.*\\)' into sc|Update codebase to Element \1|" \
-        | grep -v "Merge branch" \
+        | grep -v "Merge .*branch" \
        | grep -v "Automatic color correction" \
        | grep -v "Automatic upstream merge postprocessing" \
        | grep -v "Automatic SchildiChat string correction" \