increment_version.sh: exclude "Merge branch" lines

Change-Id: I392d38c5408e7e3e1d76baffda246106536c5912
2021-07-19 16:50:32 +02:00 · 2021-07-19 16:50:32 +02:00 · a5db52fe62
commit a5db52fe62
parent 37621d1fc7
1 changed files with 1 additions and 0 deletions
--- a/increment_version.sh
+++ b/increment_version.sh
@ -146,6 +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 "Automatic color correction" \
        | grep -v "Automatic upstream merge postprocessing" \
        | grep -v "Automatic SchildiChat string correction" \