Merge branch 'release-0.0.9'

CHANGELOG.md

@@ -1,21 +1,26 @@
+## 0.0.9 (2016-08-04)
+  - 72d3fe5 2016-08-04 | Changed git log hash length (HEAD -> release-0.0.9, develop) [Ismo Vuorinen]
+  - 94cefa4 2016-08-04 | Remove merges from git log command output [Ismo Vuorinen]
+  - 2a88069 2016-08-04 | Fixed pushing [Ismo Vuorinen]
+
 ## 0.0.8 (2016-08-04)
-  - 964866a2e355442d238994e0a31ac8a45d429c2c 2016-08-04 | Push master and dev branches explicitly (HEAD -> release-0.0.8, develop) [Ismo Vuorinen]
+  - 964866a 2016-08-04 | Push master and dev branches explicitly (HEAD -> release-0.0.8, develop) [Ismo Vuorinen]
 
 ## 0.0.7 (2016-08-04)
-  - 9408ec3c5d22b54d038c0909926ee661fbd7c25c 2016-08-04 | Change pushing to do all (HEAD -> release-0.0.7, develop) [Ismo Vuorinen]
+  - 9408ec3 2016-08-04 | Change pushing to do all (HEAD -> release-0.0.7, develop) [Ismo Vuorinen]
 
 ## 0.0.6 (2016-08-04)
-  - 5af80c229c83d1716876f767fed56fa0352dbaab 2016-08-04 | Ask should we push to origin, with tags (HEAD -> release-0.0.6, develop) [Ismo Vuorinen]
+  - 5af80c2 2016-08-04 | Ask should we push to origin, with tags (HEAD -> release-0.0.6, develop) [Ismo Vuorinen]
 
 ## 0.0.5 (2016-08-04)
-  - 9ac3cdf1f2ad87a24756614369b6911e4232ac0d 2016-08-04 | Final message to show we are done (HEAD -> release-0.0.5, origin/develop, develop) [Ismo Vuorinen]
+  - 9ac3cdf 2016-08-04 | Final message to show we are done (HEAD -> release-0.0.5, origin/develop, develop) [Ismo Vuorinen]
 
 ## 0.0.4 (2016-08-04)
-  - 865447cf1637fa413056c4ed0c52a6816eb5d0a4 2016-08-04 | Minor changes to make sure nothing strange happens when releasing (HEAD -> release-0.0.4, develop) [Ismo Vuorinen]
+  - 865447c 2016-08-04 | Minor changes to make sure nothing strange happens when releasing (HEAD -> release-0.0.4, develop) [Ismo Vuorinen]
 
 ## 0.0.3 (2016-08-04)
-  - c23b512b808fda4c2cc9edf9f618061a553c61a6 2016-08-04 | If our changelog is missing, create one? (HEAD -> release-0.0.3, develop) [Ismo Vuorinen]
+  - c23b512 2016-08-04 | If our changelog is missing, create one? (HEAD -> release-0.0.3, develop) [Ismo Vuorinen]
-  - e4f313a05698acdb55ec30538eab0477b26c0063 2016-08-04 | Add missing changelog file [Ismo Vuorinen]
+  - e4f313a 2016-08-04 | Add missing changelog file [Ismo Vuorinen]
 
 ## 0.0.2 (2016-08-04)
   - Changed date format on release header

VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

release.sh

@@ -111,7 +111,7 @@ echo $NEW_VERSION > $FILE_VERSION
 
 # Create our changelog
 echo "## $NEW_VERSION ($NOW)" > tmpfile
-git log --pretty=format:"  - %H %ad | %s%d [%an]" --date=short "$BASE_STRING"...HEAD >> tmpfile
+git log --pretty=format:"  - %h %ad | %s%d [%an]" --date=short --no-merges "$BASE_STRING"...HEAD >> tmpfile
 echo "" >> tmpfile
 echo "" >> tmpfile
 cat $FILE_CHANGELOG >> tmpfile
@@ -145,9 +145,7 @@ echo -ne "${QUESTION_FLAG} ${CYAN}Push?"
 
 read PUSH
 if [[ $PUSH =~ [yY](es)* ]] || [ "$PUSH" = "" ]; then
-    git push --tags
+    git push --all origin
-    git push $BRANCH_MASTER
-    git push $BRANCH_DEV
 fi
 
 echo -e "${NOTICE_FLAG} Done!"