X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=gen_changelog.sh;h=d28a5b132ef3d7eb1c842aeec4cb34cfb1338be9;hp=59ffb8580442ef4d38d79a9c9af0051f8a9396c6;hb=63a96f8504a2773d03bd8956c17eb6bb09a706c7;hpb=672c7918e805f090e7848a9ce62cae61f29652fe

diff --git a/gen_changelog.sh b/gen_changelog.sh
index 59ffb858..d28a5b13 100755
--- a/gen_changelog.sh
+++ b/gen_changelog.sh
@@ -9,7 +9,7 @@
 [ ! -e "ChangeLog" ] && exit 1
 
 tail -6614 ChangeLog > ChangeLog.$$.old && \
-LC_ALL=C git log 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD > ChangeLog.$$.new && \
+LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --no-follow 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD > ChangeLog.$$.new && \
 cat ChangeLog.$$.old >> ChangeLog.$$.new && \
 mv -f ChangeLog ChangeLog.bak && \
 mv -f ChangeLog.$$.new ChangeLog