-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Jack Wu
committed
Sep 10, 2014
0 parents
commit bda6d69
Showing
21 changed files
with
3,714 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
debian/files | ||
debian/*.substvars | ||
debian/*.debhelper.log | ||
debian/*/* | ||
.tags* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[submodule "shFlags"] | ||
path = shFlags | ||
url = https://github.com/nvie/shFlags.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
Authors are (ordered by first commit date): | ||
|
||
- Vincent Driessen | ||
- Benedikt Böhm | ||
- Daniel Truemper | ||
- Jason L. Shiffer | ||
- Randy Merrill | ||
- Rick Osborne | ||
- Mark Derricutt | ||
- Nowell Strite | ||
- Felipe Talavera | ||
- Guillaume-Jean Herbiet | ||
- Joseph A. Levin | ||
- Jannis Leidel | ||
- Konstantin Tjuterev | ||
- Kiall Mac Innes | ||
- Jon Bernard | ||
- Olivier Mengué | ||
- Emre Berge Ergenekon | ||
- Eric Holmes | ||
- Vedang Manerikar | ||
|
||
Portions derived from other open source works are clearly marked. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
0.4.2: | ||
----- | ||
Release date: **not yet** | ||
|
||
* `git flow init` now detects situations where origin already has gitflow | ||
branches set up, and behaves accordingly (thanks Emre Berge Ergenekon). | ||
|
||
* `git flow feature finish` can now be called without a feature branch | ||
name(prefix) argument and will finish the current branch, if on any. | ||
|
||
* `git flow feature pull` now has a `-r` flag, to support `pull --rebase` | ||
semantics (thanks Vedang Manerikar). | ||
|
||
* Various minor bug fixes related to internal argument passing. | ||
|
||
* Improved some documentation. | ||
|
||
* Better support for Windows and BSD users. | ||
|
||
* Add package installer for the Windows platform. | ||
|
||
0.4.1: | ||
----- | ||
Release date: **2011/02/04** | ||
|
||
* New option `-d` added to `git flow init`, to initialize with defaults without | ||
asking for input interactively. Ideal for creating git-flow enabled repos in | ||
custom scripts. | ||
|
||
* The parsing issues related to git-flow feature's flags are now dealt with on | ||
all known platforms. (Fixed #54, #62, #86, #97) | ||
|
||
* Escape queries for detecting branch/tag names. (Fixed #91) | ||
|
||
|
||
0.4: | ||
--- | ||
Release date: **2010/10/18** | ||
|
||
* The flag parsing issues of git-flow subcommands are solved for most | ||
platforms. | ||
|
||
* `git flow {feature,hotfix,release} finish` now takes a `-k` flag, to keep the | ||
branch around after finishing. | ||
|
||
* `git flow release finish` takes a `-n` flag, to skip tagging. | ||
|
||
* For consistency, `git flow {release,hotfix}` now, too, have a `publish` and | ||
`track` subcommand, just like `feature`. | ||
|
||
* Various minor fixes. | ||
|
||
|
||
0.3: | ||
---- | ||
Release date: **2010/07/22** | ||
|
||
* New subcommands for `git flow feature`: | ||
- **checkout**: | ||
For easily checking out features by their short name. Even allows | ||
unique prefixes as arguments (see below). | ||
|
||
- **pull**: | ||
This subcommand allows you to painlessly work on a feature branch | ||
together with another peer. This is especially valuable for doing | ||
peer reviews of other people's code. For more detailed info, see the | ||
[commit log][1]. | ||
|
||
* Easier addressing of branch names by using name prefixes. | ||
For example, when using: | ||
|
||
git flow feature finish fo | ||
|
||
this automatically finishes the feature branch `foobar` if that's the only | ||
feature branch name starting with `fo`. | ||
|
||
* No force flag anymore for new feature branches | ||
`git flow feature start` lost its `-f` (force) flag. You now don't | ||
have to be in a clean repo anymore to start a new feature branch. This | ||
avoids the manual `git stash`, `git flow feature start`, `git stash | ||
pop` cycle. | ||
|
||
* You can use `git-flow` in stand-alone repo's now. | ||
This means it does not assume you have an `origin` repository. | ||
(Thanks [Mark][2].) | ||
|
||
* No commands fetch from `origin` by default anymore. | ||
There were some issues related to disabling this flag on some platforms. | ||
|
||
* Init guesses branch names you may want to use for `develop` and `master`. | ||
|
||
* Added super-easy installation script. (Thanks [Rick][3].) | ||
|
||
* Added BSD license. | ||
|
||
[1]: http://github.com/nvie/gitflow/commit/f68d405cc3a11e9df3671f567658a6ab6ed8e0a1 | ||
[2]: http://github.com/talios | ||
[3]: http://github.com/rickosborne | ||
|
||
|
||
Older versions | ||
-------------- | ||
No change history is recorded for pre-0.3 releases. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
Copyright 2010 Vincent Driessen. All rights reserved. | ||
|
||
Redistribution and use in source and binary forms, with or without modification, | ||
are permitted provided that the following conditions are met: | ||
|
||
1. Redistributions of source code must retain the above copyright notice, | ||
this list of conditions and the following disclaimer. | ||
|
||
2. Redistributions in binary form must reproduce the above copyright notice, | ||
this list of conditions and the following disclaimer in the documentation | ||
and/or other materials provided with the distribution. | ||
|
||
THIS SOFTWARE IS PROVIDED BY VINCENT DRIESSEN ``AS IS'' AND ANY EXPRESS OR | ||
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT | ||
SHALL VINCENT DRIESSEN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE | ||
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | ||
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
||
The views and conclusions contained in the software and documentation are those | ||
of the authors and should not be interpreted as representing official policies, | ||
either expressed or implied, of Vincent Driessen. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
HubFlow | ||
======= | ||
|
||
Adds the 'git hf' Git extension to provide high-level repository operations | ||
for [DataSift's HubFlow branching model](http://datasift.github.com/gitflow/), which is based on [Vincent Driessen’s original blog post](http://nvie.com/posts/a-successful-git-branching-model/). | ||
|
||
![](http://nvie.com/img/2009/12/Screen-shot-2009-12-24-at-11.32.03.png) | ||
|
||
Installation | ||
------------ | ||
|
||
1. `git clone [email protected]:datasift/gitflow.git` | ||
2. `cd gitflow` | ||
3. `sudo ./install.sh` | ||
|
||
Windows users will need something like Cygwin in order to use this extension. | ||
|
||
Upgrading To The Latest Version | ||
------------------------------- | ||
|
||
Upgrading to the latest version of the HubFlow tools is very easy: | ||
|
||
1. `sudo git hf upgrade` | ||
|
||
Getting Started | ||
--------------- | ||
|
||
See our tutorial website to learn more about the [GitFlow](http://datasift.github.com/gitflow/IntroducingGitFlow.html) branching model and [how to use the HubFlow tools](http://datasift.github.com/gitflow/GitFlowForGitHub.html). | ||
|
||
Changelog | ||
--------- | ||
|
||
To see what's new in each release, see our [Changelog](http://datasift.github.com/gitflow/ChangeLog.html). | ||
|
||
License Terms | ||
------------- | ||
HubFlow is published under the liberal terms of the BSD License, see the | ||
[LICENSE](LICENSE) file. Although the BSD License does not require you to share | ||
any modifications you make to the source code, you are very much encouraged and | ||
invited to contribute back your modifications to the community, preferably | ||
in a Github fork, of course. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
@echo off | ||
setlocal | ||
if not "%~1"=="" set GIT_HOME=%~f1 | ||
if "%GIT_HOME%"=="" call :FindGitHome "git.cmd" | ||
|
||
if exist "%GIT_HOME%" goto :GitHomeOK | ||
|
||
echo MsysGit installation directory not found.>&2 | ||
echo Try to give the directory name on the command line:>&2 | ||
echo %0 "%ProgramFiles%\Git" | ||
endlocal | ||
exit /B 1 | ||
|
||
:GitHomeOK | ||
set ERR=0 | ||
|
||
echo Installing gitflow into "%GIT_HOME%"... | ||
|
||
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 | ||
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" | ||
|
||
:Install | ||
echo Copying files... | ||
::goto :EOF | ||
xcopy "%~dp0\..\git-flow" "%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 | ||
|
||
if %ERR%==1 choice /T 30 /C Y /D Y /M "Some unexpected errors happened. Sorry, you'll have to fix them by yourself." | ||
|
||
:End | ||
endlocal & exit /B %ERR% | ||
goto :EOF | ||
|
||
:AccessDenied | ||
set ERR=1 | ||
echo. | ||
echo You should run this script with "Full Administrator" rights:>&2 | ||
echo - Right-click with Shift on the script from the Explorer>&2 | ||
echo - Select "Run as administrator">&2 | ||
choice /T 30 /C YN /D Y /N >nul | ||
goto :End | ||
|
||
:Abort | ||
echo Installation canceled.>&2 | ||
set ERR=1 | ||
goto :End | ||
|
||
:ChkGetopt | ||
:: %1 is getopt.exe | ||
if exist "%GIT_HOME%\bin\%1" goto :EOF | ||
if exist "%~f$PATH:1" goto :EOF | ||
echo %GIT_HOME%\bin\%1 not found.>&2 | ||
echo You have to install this file manually. See the GitFlow README. | ||
exit /B 1 | ||
|
||
:FindGitHome | ||
setlocal | ||
set GIT_CMD_DIR=%~dp$PATH:1 | ||
if "%GIT_CMD_DIR%"=="" endlocal & goto :EOF | ||
endlocal & set GIT_HOME=%GIT_CMD_DIR:~0,-5% | ||
goto :EOF |
Oops, something went wrong.