From: Jean Privat <jean@pryen.org>
Date: Fri, 23 Jan 2015 04:14:12 +0000 (+0700)
Subject: Merge: improve changelog.sh
X-Git-Tag: v0.7.1~16
X-Git-Url: http://nitlanguage.org?hp=e6c5ce177790cee9f8ef9242e54811e3989a3ea3

Merge: improve changelog.sh

Don't count merges and display number of commits

Pull-Request: #1117
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
---

diff --git a/src/changelog.sh b/src/changelog.sh
index 754f545..e85393d 100755
--- a/src/changelog.sh
+++ b/src/changelog.sh
@@ -26,8 +26,10 @@ echo "shortstat"
 git diff --shortstat "$orig".."$cur"
 echo "PR"
 git log --first-parent "$orig".."$cur" | grep 'Pull-Request: #' | wc -l
+echo "non-merge commits"
+git log --no-merges --oneline "$orig".."$cur"  | wc -l
 echo "shortlog"
-git shortlog -ens "$orig".."$cur"
+git shortlog -ens --no-merges "$orig".."$cur"
 echo log
 echo
 git log --format="* %s [[!commit %h]]" --first-parent "$orig".."$cur" | tac