changelog.sh: do not include merges in changelog

This commit is contained in:
Ivailo Monev 2015-03-01 06:27:27 +00:00
parent 18568a52ea
commit 80a2761282

View file

@ -17,7 +17,7 @@ for p in "${packs[@]}";do
echo "Generating changes for $p as of $date..."
cd "$p"
changes+="\nChanges to $p since $date:"
pchanges="$(git log --since=$date --format=' * %s' | sort -u)"
pchanges="$(git log --no-merges --since=$date --format=' * %s' | sort -u)"
if [ -z "$pchanges" ];then
pchanges=" * none"
fi