nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/model: generalize visibility to all MEntities
[nit.git]
/
src
/
changelog.sh
diff --git
a/src/changelog.sh
b/src/changelog.sh
index
754f545
..
e85393d
100755
(executable)
--- 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
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"
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
echo log
echo
git log --format="* %s [[!commit %h]]" --first-parent "$orig".."$cur" | tac