Change time based changelog to diff between master and last tag

timetabio · Jan 12, 2017 · da58336 · da58336
1 parent 5ad46f1
commit da58336
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
@@ -5,7 +5,7 @@ if [ -z "${1}" ]; then
   exit 1
 fi
 
-CHANGELOG=$(git log --pretty=format:"- %s%n" --since="$(git show -s --format=%ad `git rev-list --tags --max-count=1`)" | grep -v "Merge branch" | grep .)
+CHANGELOG=$(git log --pretty=format:"- %s%n" master...$(git describe --abbrev=0 --tags) | grep -v "Merge branch" | grep -v "Merge commit" | grep .)
 MESSAGE="${1}\n\n${CHANGELOG}"
 FILE=$(mktemp)