From 80a2761282a36c78d2415ab50a91581bd5b4afa2 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 1 Mar 2015 06:27:27 +0000 Subject: [PATCH] changelog.sh: do not include merges in changelog --- changelog.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.sh b/changelog.sh index 147d061..9757e12 100755 --- a/changelog.sh +++ b/changelog.sh @@ -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