Allow multiple hotfix branches.

By setting the config gitflow.multi-hotfix to true, you can have multiple hotfix branches. Example: git config --set gitflow.multi-hotfix true

Closes nvie#167

Changes.mdown

@@ -26,11 +26,14 @@
 
 # Changelog
 
-#### 1.9.0-dev.17
+#### 1.9.0-dev.18
 [Peter van der Does][petervanderdoes]
 * Repositories with spaces in path cause the pre * post hook to fail
 * Error using git flow log.
 * Using defaults with init fails with existing repository.
+* Allow multiple hotfix branches.
+  By setting the config gitflow.multi-hotfix to true, you can have multiple 
+  hotfix branches. Example: git config --set gitflow.multi-hotfix true
 
 [Gergely Nagy][algernon]
 * Remove bash code.

git-flow-hotfix

@@ -203,7 +203,9 @@ F,[no]fetch       Fetch from origin before performing local operation
 	BRANCH=$PREFIX$VERSION
 
 	gitflow_require_version_arg
-	require_no_existing_hotfix_branches
+	if ! $(git config --bool --get gitflow.multi-hotfix 2>&1); then
+		require_no_existing_hotfix_branches
+	fi
 
 	# Sanity checks
 	require_branch_absent "$BRANCH"
@@ -313,7 +315,7 @@ p,[no]preserve-merges  Preserve merges
 	require_clean_working_tree
 	require_branch "$BRANCH"
 
-    git_local_branch_exists "$BASE_BRANCH" || die "The base '$BASE_BRANCH' doesn't exists locally or is not a branch. Can't rebase the hotfixe branch '$BRANCH'."
+	git_local_branch_exists "$BASE_BRANCH" || die "The base '$BASE_BRANCH' doesn't exists locally or is not a branch. Can't rebase the hotfixe branch '$BRANCH'."
 
 	git_do checkout -q "$BRANCH"  || die "Could not check out branch '$BRANCH'."
 	if flag interactive; then

git-flow-version

@@ -35,7 +35,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-GITFLOW_VERSION=1.9.0-dev.17
+GITFLOW_VERSION=1.9.0-dev.18
 
 initialize() {
 	# A function can not be empty. Comments count as empty.