Merge branch 'release-0.0.6'

Incrementing version number to 0.0.6
Ask should we push to origin, with tags
2026-01-27 04:45:00 +00:00 · 2016-08-04 17:04:03 +03:00 · 2016-08-04 17:04:03 +03:00 · 2016-08-04 17:03:36 +03:00 · 2016-08-04 16:58:10 +03:00 · 2016-08-04 16:58:10 +03:00
3 changed files with 17 additions and 10 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,20 +1,18 @@
+## 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]
+
+## 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]
+
 ## 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]
-  - f58d1c50ddc441665adc100912455f95bba21d61 2016-08-04 | Merge branch 'release-0.0.3' (tag: 0.0.3, master) [Ismo Vuorinen]
-  - 6bc0934eee3ce77a09aaa0f91528d9febc871dde 2016-08-04 | Merge branch 'release-0.0.3' into develop [Ismo Vuorinen]
-  - f25536b8a18cb4b46af53623b3ba89787ae7df7d 2016-08-04 | Merge branch 'release-0.0.2' (tag: 0.0.2) [Ismo Vuorinen]
-  - f711b92ba293b4cb6e983d0b0cd8f2a76352c428 2016-08-04 | Merge branch 'release-0.0.1' (tag: 0.0.1) [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]
  - e4f313a05698acdb55ec30538eab0477b26c0063 2016-08-04 | Add missing changelog file [Ismo Vuorinen]
-  - f25536b8a18cb4b46af53623b3ba89787ae7df7d 2016-08-04 | Merge branch 'release-0.0.2' (tag: 0.0.2, master) [Ismo Vuorinen]
-  - dd0341cb923241bca5e02d4b4d1a894708cf804b 2016-08-04 | Merge branch 'release-0.0.2' into develop [Ismo Vuorinen]
-  - f711b92ba293b4cb6e983d0b0cd8f2a76352c428 2016-08-04 | Merge branch 'release-0.0.1' (tag: 0.0.1) [Ismo Vuorinen]

 ## 0.0.2 (2016-08-04)
-  - f711b92ba293b4cb6e983d0b0cd8f2a76352c428 2016-08-04 | Merge branch 'release-0.0.1' (tag: 0.0.1, master) [Ismo Vuorinen]
-  - 997beeebb0ba05c60590ecf96cb18fc1e58a336a 2016-08-04 | Merge branch 'release-0.0.1' into develop (HEAD -> release-0.0.2, develop) [Ismo Vuorinen]
+  - Changed date format on release header

 ## 0.0.1 (Elokuu 04, 2016)
  - Uncomment rest of the script
--- a/2
+++ b/2
@@ -1 +1 @@
-0.0.4
+0.0.6
--- a/release.sh
+++ b/release.sh
@@ -140,3 +140,12 @@ git merge --no-ff $BRANCH_RELEASE

 # Remove release branch
 git branch -d $BRANCH_RELEASE
+
+echo -ne "${QUESTION_FLAG} ${CYAN}Push to origin?"
+
+read PUSH
+if [[ $PUSH =~ [yY](es)* ]] || [ "$PUSH" = "" ]; then
+    git push origin --tags
+fi
+
+echo -e "${NOTICE_FLAG} Done!"
Author	SHA1	Message	Date
Ismo Vuorinen	a9fa72574a	Merge branch 'release-0.0.6'	2016-08-04 17:04:03 +03:00
Ismo Vuorinen	0fa05f5f9e	Incrementing version number to 0.0.6	2016-08-04 17:04:03 +03:00
Ismo Vuorinen	5af80c229c	Ask should we push to origin, with tags	2016-08-04 17:03:36 +03:00
Ismo Vuorinen	bea29b3ce3	Merge branch 'release-0.0.5'	2016-08-04 16:58:10 +03:00
Ismo Vuorinen	497fbd22a7	Merge branch 'release-0.0.5' into develop	2016-08-04 16:58:10 +03:00
Ismo Vuorinen	7514595f35	Incrementing version number to 0.0.5	2016-08-04 16:58:10 +03:00
Ismo Vuorinen	9ac3cdf1f2	Final message to show we are done	2016-08-04 16:54:38 +03:00
Ismo Vuorinen	5d09d34489	Merge branch 'release-0.0.4' into develop	2016-08-04 16:45:20 +03:00
@@ -1 +1 @@
 .0.4
 .0.6