From 68f7ce646bb6a5defb8530c5036171e9fc376968 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 Jan 2024 13:22:50 +0900
Subject: [PATCH] fix: avoid including merge commits in CHANGELOG

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

diff --git a/update.sh b/update.sh
index 6e52c2649..58d466a85 100755
--- a/update.sh
+++ b/update.sh
@@ -21,7 +21,7 @@ run 'git pull --ff --no-edit --autostash --strategy-option theirs'
 NEW_COMMIT=$(git rev-parse --short HEAD)
 
 if [ "${OLD_COMMIT}" != "${NEW_COMMIT}" ]; then
-  run "git log --reverse --format='%s (by %an)' ${OLD_COMMIT}..${NEW_COMMIT} > neko/volume/CHANGELOG"
+  run "git log --no-merges --reverse --format='%s (by %an)' ${OLD_COMMIT}..${NEW_COMMIT} > neko/volume/CHANGELOG"
 fi
 
 say 'Pulled successfully!'