diff --git a/changelog.sh b/changelog.sh index bac6419c..c993dd6d 100755 --- a/changelog.sh +++ b/changelog.sh @@ -20,7 +20,7 @@ for LINE in "${LINES[@]}"; do elif [[ $LINE = *"fix:"* ]]; then LINE=$(echo "$LINE" | sed -E "s/^fix: //") FIXES+=("$LINE") - elif [[ $LINE != *"i did not bother commenting"* ]]; then + elif [[ $LINE != *"i did not bother commenting"* ]] && [[ $LINE != *"Merge "* ]]; then echo "MISC LINE =$LINE" LINE=$(echo "$LINE" | sed -E "s/^[a-z]+: //") MISC+=("$LINE")