fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 new-version.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c38b15bea8dd228faa781427bf0ceca52f155848
Merge: bd423ed eb72b79
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Apr 10 07:04:37 2024 +0000

    Merge branch 'no-merges-in-news' into 'main'
    
    Do not add merge commits into NEWS file
    
    See merge request fontconfig/fontconfig!320

commit eb72b79e77040eedf91c03288304b287aed5a2bb
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Apr 10 15:56:52 2024 +0900

    Do not add merge commits into NEWS file

diff --git a/new-version.sh b/new-version.sh
index e593862..9c42979 100644
--- a/new-version.sh
+++ b/new-version.sh
@@ -115,7 +115,7 @@ if [ $version != $last ]; then
 	
 	echo $version_note
 	echo
-	git log --pretty=short $last.. | git shortlog | cat
+	git log --no-merges --pretty=short $last.. | git shortlog | cat
 	
 	#
 	# previous changelogs