#66 No merge commits in change log

Author: JBlond

changelog.md

@@ -152,7 +152,6 @@
 *  remove list, but use an array [View](https://github.com/JBlond/php-diff/commit/aed258fe7de577fefcd618eb788f7503f2627d0d)
 *  remove blank line [View](https://github.com/JBlond/php-diff/commit/35cd1ebc4702d71e6d1d0f0f6f24639cd8e450bf)
 *  Code Fixes, Optimization, cleanup, refactoring and commenting. [View](https://github.com/JBlond/php-diff/commit/78a16587d681fc687de586321a7cb9659004f16a)
-*  merge master into development [View](https://github.com/JBlond/php-diff/commit/47b8a7bfd676b12f5af01afb6c3f6579969df673)
 
 ## v1.14 (2019-12-03)
 

changelog.sh

@@ -9,8 +9,8 @@ do
 	if [ "$previous_tag" != 0 ];then
 		tag_date=$(git log -1 --pretty=format:'%ad' --date=short ${previous_tag})
 		printf "## ${previous_tag} (${tag_date})\n\n" >> changelog.md
-		git log ${current_tag}...${previous_tag} --pretty=format:'*  %s [View](https://github.com/JBlond/php-diff/commit/%H)' --reverse | grep -v Merge  >> changelog.md
+		git log ${current_tag}...${previous_tag} --no-merges --pretty=format:'*  %s [View](https://github.com/JBlond/php-diff/commit/%H)' --reverse | grep -v Merge  >> changelog.md
 		printf "\n"  >> changelog.md
 	fi
 	previous_tag=${current_tag}
-done
+done