fix(changelog): also display commits from merged branches
Diff
1diff --git a/tools/changelog.sh b/tools/changelog.sh
2index 56ea42cb1e0c2db56263b14323b8c56ee4731ba9..6913ae49a15b2dcc5d780960c9c82e031aa4a612 100755
3--- a/tools/changelog.sh
4+++ b/tools/changelog.sh
5@@ -391,9 +391,7 @@ function main {
6 7 # Get commit list from $until commit until $since commit, or until root
8 # commit if $since is unset, in short hash form.
9- # --first-parent is used when dealing with merges: it only prints the
10- # merge commit, not the commits of the merged branch.
11- command git rev-list --first-parent --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do
12+ command git rev-list --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do
13 # Truncate list on versions with a lot of commits
14 if [[ -z "$since" ]] && (( ++read_commits > 35 )); then
15 truncate=1