core(release): 2.0.0 signify new official fork

This release contains a few minor updates from the origional fork. The
main purprose for this release though is to clearly differentiate
gitflow-cjs from gitflow-avh via the change in the major version.

Author: ChrisJStone

CHANGELOG-AVH.md

@@ -1,9 +1,14 @@
-# git-flow (AVH Edition)
+# git-flow (CJS Edition)
 
 A collection of Git extensions to provide high-level repository operations
 for Vincent Driessen's [branching model](http://nvie.com/git-model "original
 blog post"). This fork adds functionality not added to the original branch.
 
+## Why another git-flow fork
+The last commit to [gitflow-avh](https://github.com/petervanderdoes/gitflow-avh)
+was on May 23, 2019. Since then there have been a number of issues opened that have
+not be resolved. This fork will address those outstanding issues and open PR's along
+with continueing to maintain the git-flow branching model.
 
 ## Getting started
 
@@ -45,7 +50,7 @@ of the project Wiki.
 * Version Numbering Scheme.  
 Starting with version 1.0, the project uses the following scheme:
 \<MAJOR\>.\<MINOR\>.\<REVISION\>\
-* AVH is the acronym of "A VirtualHome"
+* CJS is the acronym of "CJ Systems"
 
 ## Please help out
 
@@ -66,33 +71,22 @@ using the complete version number.
 
 ## Contributing
 
-Fork the repository.  Then, run:
+If you are resubmiting an open pull request see below. If submiting a new pull request addressing an already open issue with gitflow-avh please link the relevant issue in the description. For any new issues please see below
 
-```shell
-git clone -b master [email protected]:<username>/gitflow-cjs.git
-cd gitflow-cjs
-```
-
-The `-b master` switch has to be added since the fork operation automatically
-clones the `develop` branch of the official gitflow repository and cloning it
-results in a local repository with just a `develop` branch.
-
-If you do not have gitflow installed yet install it by running `make && make install`.
-
-After that initialize the local gitflow repository with gitflow itself:
+### Quick Start for new issues
 
-```shell
-git flow init -d
-git flow feature start <your feature>
-```
-
-Then, do work and commit your changes.
+* Please fork and clone a local copy of [gitflow-cjs](https://github.com/CJ-Systems/gitflow-cjs).
+* Create a seperate issue branch based off develop.
+* Commit commit you fix to the local branch.
+* Please update your local copy with the latest devlop branch of [gitflow-cjs](https://github.com/CJ-Systems/gitflow-cjs)
+* Rebase develop onto your local branch.
+* Push your fix to your fork.
+* When ready to submit a pull request.
 
-```shell
-git flow feature publish <your feature>
-```
+### How to submit a pull request
+When resubmitting an open pull request from [gitflow-avh](https://github.com/petervanderdoes/gitflow-avh) the base repository will need to be changed from petervanderdoes/gitflow-avh to CJ-Systems/gitflow-cjs.
 
-When done, open a pull request to your feature branch.
+For any new PRs releated to gitflow-cjs you can use on of the keywords from [Linking a pull request to an issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) to automatically close the releated issue.
 
 ## License terms
 

CHANGELOG.md

@@ -57,6 +57,7 @@ git flow bugfix rebase
 git flow bugfix checkout
 git flow bugfix pull
 git flow bugfix delete
+git flow bugfix rename
 
 Manage your bugfix branches.
 
@@ -831,7 +832,7 @@ r,[no]remote     Delete remote branch
 
 cmd_rename() {
 	OPTIONS_SPEC="\
-git flow bugfix rename <new_name> [<new_name>]
+git flow bugfix rename [<old_name>] <new_name>
 
 Rename a given bugfix branch
 --

README.md

@@ -57,6 +57,7 @@ git flow feature rebase
 git flow feature checkout
 git flow feature pull
 git flow feature delete
+git flow feature rename
 
 Manage your feature branches.
 
@@ -832,7 +833,7 @@ r,[no]remote     Delete remote branch
 
 cmd_rename() {
 	OPTIONS_SPEC="\
-git flow feature rename <new_name> [<new_name>]
+git flow feature rename [<old_name>] <new_name>
 
 Rename a given feature branch
 --

git-flow-bugfix

@@ -53,6 +53,9 @@ git flow hotfix start
 git flow hotfix finish
 git flow hotfix publish
 git flow hotfix delete
+git flow hotfix rebase
+git flow hotfix track
+git flow hotfix rename
 
 Manage your hotfix branches.
 
@@ -732,7 +735,7 @@ r,[no]remote          Delete remote branch
 
 cmd_rename() {
 	OPTIONS_SPEC="\
-git flow hotfix rename <new_name> [<new_name>]
+git flow hotfix rename [<old_name>] <new_name>
 
 Rename a given hotfix branch
 --

git-flow-feature

@@ -434,8 +434,10 @@ usage() {
 git flow release [list]
 git flow release start
 git flow release finish
+git flow release branch
 git flow release publish
 git flow release track
+git flow release rebase
 git flow release delete
 
 Manage your release branches.
@@ -555,7 +557,6 @@ Start a new release branch
 h,help!              Show this help
 showcommands!        Show git commands while executing them
 F,[no]fetch          Fetch from $ORIGIN before performing finish
-v,verbose!           Verbose (more) output
 "
 	local base
 

git-flow-hotfix

@@ -50,6 +50,7 @@ usage() {
 		OPTIONS_SPEC="\
 git flow support [list]
 git flow support start
+git flow support rebase
 
 Manage your support branches.
 

git-flow-release

@@ -38,7 +38,7 @@
 #
 
 
-GITFLOW_VERSION=1.12.5
+GITFLOW_VERSION=2.0.0
 
 initialize() {
 	# A function can not be empty. Comments count as empty.

git-flow-support

@@ -609,15 +609,17 @@ gitflow_rename_branch() {
 	# read arguments into global variables
 	if [ -z $1 ]; then
 		NEW_NAME=''
-	else
-		NEW_NAME=$1
-	fi
-
-	if [ -z $2 ]; then
 		NAME=''
 	else
-		NAME=$2
+		if [ -z $2 ]; then
+			NAME=''
+			NEW_NAME=$1
+		else
+			NAME=$1
+			NEW_NAME=$2
+		fi
 	fi
+
 	BRANCH=${PREFIX}${NAME}
 	NEW_BRANCH=${PREFIX}${NEW_NAME}