From 7c5ab01a5f7b07481182108117db070b8cabb2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 14 Aug 2021 22:41:48 +0200
Subject: [PATCH] fix(changelog): also display commits from merged branches

---
 tools/changelog.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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