3.0.0

git-town · Feb 8, 2017 · a9ee50e · a9ee50e
1 parent a5732e9
commit a9ee50e
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 16 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -2,6 +2,20 @@
 
 ## Unreleased
 
+## 3.0.0 (2016-02-07)
+
+#### BREAKING CHANGES
+* `git hack`: no longer accepts a parent branch (functionality moved to `git append`)
+
+#### New Features
+* `git append`: create a new branch as a child of the current branch
+* `git prepend`: create a new branch as a parent of the current branch
+* `git rename-branch`: implicitly uses the current branch if only one branch name provided
+
+#### Bug Fixes
+* fix incorrectly reported branch loop
+  ([#785](https://github.com/Originate/git-town/issues/785))
+
 ## 2.1.0 (2016-12-26)
 
 #### New Features

diff --git a/features/git-town/version.feature b/features/git-town/version.feature
@@ -7,10 +7,10 @@ Feature: git town: show the current Git Town version
 
   Scenario: Using "version" flag
     When I run `git town version`
-    Then I see "Git Town 2.1.0"
+    Then I see "Git Town 3.0.0"
 
 
   Scenario: Running outside of a Git repository
     Given I'm currently not in a git repository
     When I run `git town version`
-    Then I see "Git Town 2.1.0"
+    Then I see "Git Town 3.0.0"
diff --git a/man/man1/git-town-append.1 b/man/man1/git-town-append.1
@@ -1,4 +1,4 @@
-.TH "GIT-TOWN-APPEND" "1" "12/26/2016" "Git Town 2\&.1\&.0" "Git Town Manual"
+.TH "GIT-TOWN-APPEND" "1" "02/07/2016" "Git Town 3\&.0\&.0" "Git Town Manual"
 
 .SH "NAME"
 git town-append \- create a new feature branch as a direct child of the current branch

diff --git a/man/man1/git-town-hack.1 b/man/man1/git-town-hack.1
@@ -1,4 +1,4 @@
-.TH "GIT-TOWN-HACK" "1" "12/26/2016" "Git Town 2\&.1\&.0" "Git Town Manual"
+.TH "GIT-TOWN-HACK" "1" "02/07/2016" "Git Town 3\&.0\&.0" "Git Town Manual"
 
 .SH "NAME"
 git town-hack \- create a new feature branch off the main development branch

diff --git a/man/man1/git-town-kill.1 b/man/man1/git-town-kill.1
@@ -1,4 +1,4 @@
-.TH "GIT-TOWN-KILL" "1" "12/26/2016" "Git Town 2\&.1\&.0" "Git Town Manual"
+.TH "GIT-TOWN-KILL" "1" "02/07/2016" "Git Town 3\&.0\&.0" "Git Town Manual"
 
 .SH "NAME"
 git town-kill \- remove an obsolete feature branch

diff --git a/man/man1/git-town-new-pull-request.1 b/man/man1/git-town-new-pull-request.1
@@ -1,4 +1,4 @@
-.TH "GIT-TOWN-NEW-PULL-REQUEST" "1" "12/26/2016" "Git Town 2\&.1\&.0" "Git Town Manual"
+.TH "GIT-TOWN-NEW-PULL-REQUEST" "1" "02/07/2016" "Git Town 3\&.0\&.0" "Git Town Manual"
 
 .SH "NAME"
 git-town-new-pull-request \- create a new pull request

diff --git a/man/man1/git-town-prepend.1 b/man/man1/git-town-prepend.1
@@ -1,4 +1,4 @@
-.TH "GIT-TOWN-PREPEND" "1" "12/26/2016" "Git Town 2\&.1\&.0" "Git Town Manual"
+.TH "GIT-TOWN-PREPEND" "1" "02/07/2016" "Git Town 3\&.0\&.0" "Git Town Manual"
 
 .SH "NAME"
 git town-prepend \- create a new feature branch between the current branch and its parent

diff --git a/man/man1/git-town-prune-branches.1 b/man/man1/git-town-prune-branches.1
@@ -1,4 +1,4 @@
-.TH "GIT-TOWN-PRUNE-BRANCHES" "1" "12/26/2016" "Git Town 2\&.1\&.0" "Git Town Manual"
+.TH "GIT-TOWN-PRUNE-BRANCHES" "1" "02/07/2016" "Git Town 3\&.0\&.0" "Git Town Manual"
 
 .SH "NAME"
 git-town-prune-branches \- delete merged branches

diff --git a/man/man1/git-town-rename-branch.1 b/man/man1/git-town-rename-branch.1
@@ -1,4 +1,4 @@
-.TH "GIT-TOWN-RENAME-BRANCH" "1" "12/26/2016" "Git Town 2\&.1\&.0" "Git Town Manual"
+.TH "GIT-TOWN-RENAME-BRANCH" "1" "02/07/2016" "Git Town 3\&.0\&.0" "Git Town Manual"
 
 .SH "NAME"
 git-town-rename-branch \- rename a branch both locally and remotely

diff --git a/man/man1/git-town-repo.1 b/man/man1/git-town-repo.1
@@ -1,4 +1,4 @@
-.TH "GIT-TOWN-REPO" "1" "12/26/2016" "Git Town 2\&.1\&.0" "Git Town Manual"
+.TH "GIT-TOWN-REPO" "1" "02/07/2016" "Git Town 3\&.0\&.0" "Git Town Manual"
 
 .SH "NAME"
 git-town-repo \- view the repository homepage

diff --git a/man/man1/git-town-ship.1 b/man/man1/git-town-ship.1
@@ -1,4 +1,4 @@
-.TH "GIT-TOWN-SHIP" "1" "12/26/2016" "Git Town 2\&.1\&.0" "Git Town Manual"
+.TH "GIT-TOWN-SHIP" "1" "02/07/2016" "Git Town 3\&.0\&.0" "Git Town Manual"
 
 .SH "NAME"
 git town-ship \- deliver a completed feature branch

diff --git a/man/man1/git-town-sync.1 b/man/man1/git-town-sync.1
@@ -1,4 +1,4 @@
-.TH "GIT-TOWN-SYNC" "1" "12/26/2016" "Git Town 2\&.1\&.0" "Git Town Manual"
+.TH "GIT-TOWN-SYNC" "1" "02/07/2016" "Git Town 3\&.0\&.0" "Git Town Manual"
 
 .SH "NAME"
 git town-sync \- update the current branch with all relevant changes

diff --git a/man/man1/git-town.1 b/man/man1/git-town.1
@@ -1,4 +1,4 @@
-.TH "GIT-TOWN" "1" "12/26/2016" "Git Town 2\&.1\&.0" "Git Town Manual"
+.TH "GIT-TOWN" "1" "02/07/2016" "Git Town 3\&.0\&.0" "Git Town Manual"
 
 .SH "SYNOPSIS"
 \fIgit town\fR alias [true | false]

diff --git a/package/debian/Dockerfile b/package/debian/Dockerfile
@@ -2,7 +2,7 @@ FROM amezin/debian-build-essentials:jessie
 MAINTAINER allonsy
 
 #supply the version number here. Do not prepend a 'v'
-ENV version 2.1.0
+ENV version 3.0.0
 
 RUN apt-get update && apt-get install -y git
 

diff --git a/package/debian/debian/changelog b/package/debian/debian/changelog
@@ -1,4 +1,4 @@
-gittown (2.1.0) RELEASED; urgency=medium
+gittown (3.0.0) RELEASED; urgency=medium
 
   * See https://github.com/Originate/git-town/releases for a complete changelog
 

diff --git a/src/git-town b/src/git-town
@@ -31,7 +31,7 @@ function show_help {
 
 
 function show_version {
-  local version="2.1.0"
+  local version="3.0.0"
   if [ "$(is_git_town_installed_manually)" == true ]; then
     version="$version $(git_town_revision)"
   fi