Git extensions to provide high-level repository operations for Vincent Driessen's branching model.
Pull request Compare This branch is even with flaptor:develop.
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Permalink
Failed to load latest commit information.
contrib
shFlags @ 2fb06af
.gitmodules
AUTHORS
Changes.mdown
LICENSE
Makefile
README.mdown
bump-version
git-flow
git-flow-change
git-flow-completion.bash
git-flow-feature
git-flow-files
git-flow-hotfix
git-flow-init
git-flow-log
git-flow-release
git-flow-show
git-flow-support
git-flow-sync
git-flow-version
gitflow-common
gitflow-shFlags

README.mdown

git-flow Project status

A collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model.

Installing flaptor's git-flow

The bare minimum:

GitFlow as most git extensions works just by having the right-named executables in your command path. So just copying the git-flow-* scripts in the top-level directory into your path should work.

Linux, etc. (including Mac OS)

An easy way to install git-flow is using Rick Osborne's excellent git-flow installer, which can be run using the following command:

$ wget --no-check-certificate -q -O - https://github.com/flaptor/gitflow/raw/develop/contrib/gitflow-installer.sh | sudo sh

Manual installation

If you prefer a manual installation, please use the following instructions:

$ git clone --recursive git://github.com/flaptor/gitflow.git

Then, you can install git-flow, using:

$ sudo make install

By default, git-flow will be installed in /usr/local. To change the prefix where git-flow will be installed, simply specify it explicitly, using:

$ sudo make prefix=/opt/local install

Or simply point your PATH environment variable to your git-flow checkout directory.

Installation note:
git-flow depends on the availability of the command line utility getopt, which may not be available in your Unix/Linux environment. Please use your favorite package manager to install getopt. For Cygwin, install the util-linux package to get getopt. If you use apt-get as your install manager, the package name is opt.

Integration with your shell

For those who use the Bash or ZSH shell, please check out the excellent work on the git-flow-completion project by bobthecow. It offers tab-completion for all git-flow subcommands and branch names.

For Windows users, msysgit is a good starting place for installing git.

Getting started for use with IndexTank's repo:

Setting up:

  • Clone flaptor/indextank in a clean repo. The only remote has to be named "origin" and point to flaptor/indextank, or bad thing will happen :(
  • Checkout as origin/master as master and origin/production as production.

  • Run "git flow init", and accept all defaults.

Usage:

To work on a new feature:

  • git flow feature start <feature name>

  • <Do your work, commiting as necessary as many times as you need>

  • git flow feature finish <feature name>

To make a quick change to production:

  • git flow hotfix start <hotfix name>

  • <Do your work>

  • git flow hotfix finish <hotfix name>

FAQ

See the FAQ section of the project Wiki.

Please help out

This project is still under development. Feedback and suggestions are very welcome and I encourage you to use the Issues list on Github to provide that feedback.

Feel free to fork this repo and to commit your additions. For a list of all contributors, please see the AUTHORS file.

Any questions, tips, or general discussion can be posted to our Google group: http://groups.google.com/group/gitflow-users

License terms

git-flow is published under the liberal terms of the BSD License, see the 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.

Initialization

To initialize a new repo with the basic branch structure, use:

    git flow init

This will then interactively prompt you with some questions on which branches you would like to use as development and production branches, and how you would like your prefixes be named. You may simply press Return on any of those questions to accept the (sane) default suggestions.

Creating feature/release/hotfix/support branches

  • To list/start/finish feature branches, use:

    git flow feature
    git flow feature start <name> [<base>]
    git flow feature finish <name>
    

    For feature branches, the <base> arg must be a commit on develop.

  • To list/start/finish release branches, use:

    git flow release
    git flow release start <release> [<base>]
    git flow release finish <release>
    

    For release branches, the <base> arg must be a commit on develop.

  • To list/start/finish hotfix branches, use:

    git flow hotfix
    git flow hotfix start <release> [<base>]
    git flow hotfix finish <release>
    

    For hotfix branches, the <base> arg must be a commit on master.

  • To list/start support branches, use:

    git flow support
    git flow support start <release> <base>
    

    For support branches, the <base> arg must be a commit on master.

Showing your appreciation

A few people already requested it, so now it's here: a Flattr button.

Of course, the best way to show your appreciation for the original blog post or the git-flow tool itself remains contributing to the community. If you'd like to show your appreciation in another way, however, consider Flattr'ing me:

Flattr this