From 2354742a1c7e8f7841baf58966605e6d4f97f75e Mon Sep 17 00:00:00 2001
From: yujunpeng <yujunpeng@zhubajie.com>
Date: Tue, 20 Aug 2013 15:09:24 +0800
Subject: [PATCH 1/2] support install on msysgit

---
 contrib/msysgit-install.cmd | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/msysgit-install.cmd b/contrib/msysgit-install.cmd
index 5f005bfa7..4e6e12442 100644
--- a/contrib/msysgit-install.cmd
+++ b/contrib/msysgit-install.cmd
@@ -20,25 +20,25 @@ call :ChkGetopt getopt.exe || set ERR=1
 if %ERR%==1 goto :End
 echo getopt.exe... Found
 
-if not exist "%GIT_HOME%\bin\git-flow" goto :Install
-echo GitFlow is already installed.>&2
+if not exist "%GIT_HOME%\bin\git-hf" goto :Install
+echo HubFlow is already installed.>&2
 set /p mychoice="Do you want to replace it [y/n]"
 if "%mychoice%"=="y" goto :DeleteOldFiles
 goto :Abort
 
 :DeleteOldFiles
 echo Deleting old files...
-for /F %%i in ("%GIT_HOME%\git-flow*" "%GIT_HOME%\gitflow-*") do if exist "%%~fi" del /F /Q "%%~fi"
+for /F %%i in ("%GIT_HOME%\git-hf*" "%GIT_HOME%\gitflow-*") do if exist "%%~fi" del /F /Q "%%~fi"
 
 :Install
 echo Copying files...
 ::goto :EOF
-xcopy "%~dp0\..\git-flow"            "%GIT_HOME%\bin"                 /Y /R /F
+xcopy "%~dp0\..\git-hf"            "%GIT_HOME%\bin"                 /Y /R /F
 if errorlevel 4 if not errorlevel 5 goto :AccessDenied
 if errorlevel 1 set ERR=1
-xcopy "%~dp0\..\git-flow*"           "%GIT_HOME%\bin"                 /Y /R /F || set ERR=1
-xcopy "%~dp0\..\gitflow-*"           "%GIT_HOME%\bin"                 /Y /R /F || set ERR=1
-xcopy "%~dp0\..\shFlags\src\shflags" "%GIT_HOME%\bin\gitflow-shFlags" /Y /R /F || set ERR=1
+xcopy "%~dp0\..\git-hf*"           "%GIT_HOME%\bin"                 /Y /R /F || set ERR=1
+xcopy "%~dp0\..\hubflow-*"           "%GIT_HOME%\bin"                 /Y /R /F || set ERR=1
+xcopy "%~dp0\..\shFlags\src\shflags" "%GIT_HOME%\bin\hubflow-shFlags" /Y /R /F || set ERR=1
 
 if %ERR%==1 choice /T 30 /C Y /D Y /M "Some unexpected errors happened. Sorry, you'll have to fix them by yourself."
 

From 8dea0098e14cdcf146b29908d4c19d089149bca1 Mon Sep 17 00:00:00 2001
From: fishg <fishgylk@gmail.com>
Date: Fri, 23 Aug 2013 10:47:59 +0800
Subject: [PATCH 2/2] Update git-hf-hotfix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git hf hotfix finish 命令参数说明bug修复
---
 git-hf-hotfix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-hf-hotfix b/git-hf-hotfix
index cf5aae6b1..c294f2fa2 100644
--- a/git-hf-hotfix
+++ b/git-hf-hotfix
@@ -49,7 +49,7 @@ PREFIX=$(git config --get hubflow.prefix.hotfix)
 usage() {
 	echo "usage: git hf hotfix [list] [-v]"
 	echo "       git hf hotfix start <version> [<base>]"
-	echo "       git hf hotfix finish [-sumpk] <version>"
+	echo "       git hf hotfix finish [-Fsumpkn] <version>"
 	echo "       git hf hotfix track <name>"
 	echo "       git hf hotfix pull [-r] [<remote> [<version>]]"
 	echo "       git hf hotfix push [<remote> [<version>]]"