1
0
Fork 1
mirror of https://example.com synced 2024-11-22 16:56:38 +09:00

fix: avoid including merge commits in CHANGELOG

This commit is contained in:
naskya 2024-01-05 13:22:50 +09:00
parent 13c10f4816
commit 68f7ce646b
Signed by: naskya
GPG key ID: 712D413B3A9FED5C

View file

@ -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!'