diff --git a/index.html b/index.html index d611f9c..25b3e01 100644 --- a/index.html +++ b/index.html @@ -81,339 +81,13 @@
-

Basic tips

- +

Wait for it...

+

Sorry, the cheatsheet is still 'in development' - stay tuned

★ ★ ★

+

Expect a release near the end of august 2012

-
-

Setup

- -
-

OSX

-
- $ brew install git-flow -
-

Linux

-
- $ apt-get install git-flow -
-

Windows (Cygwin)

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

- You need a working git installation as prerequirement.
- For detailed instructions please visit the git flow - wiki. -

- install git-flow -
-
- -
-

Getting started

- -
-

Initialize

- -

Start using git-flow by initializing it inside an existing git repository:

-
- - git flow init - -
-

- You'll have to answer a few questions regarding the naming conventions for your branches.
- It's recommended to use the default values. -

- -
-
-
-
-
- -
-

Features

- - -
-

Start a new feature

- -

Development of new features starting from the 'develop' branch.

- -

Start developing a new feature with

-
- - git-flow feature start MYFEATURE - -
-

This action creates a new feature branch based on 'develop' and switches to it

-
-
-
-
-
-
- -
-
-

Finish up a feature

- -

- Finish the development of a feature. - This action performs the following -

- - -
- - git-flow feature finish MYFEATURE - -
-
-
-
-
-
- -
-
-

Publish a feature

- -

- Are you developing a feature in collaboration?
- Publish a feature to the remote server so it can be used by other users. -

- -
- - git-flow feature publish MYFEATURE - -
-
-
- publish feature -
-
- -
-
-

Getting a published feature

-

- Get a feature published by another user and track remote changes. -

- -
- - git-flow feature pull MYFEATURE - -
-
-
- publish feature -
-
- - -
-

Make a release

- - - -
-

Start a release

- -

To start a release, use the git flow release command. It

- creates a release branch created from the 'develop' branch. -

-
- - git flow release start RELEASE [BASE] - -
-

You can optionally supply a [BASE] commit sha-1 hash to start the release from. The commit must - be on the - 'develop' branch.

-
-
-
-
-
- -
-
-

Finish up a release

- -

Finishing a release is one of the big steps in git branching. It performs several actions:

- -
- - git flow release finish RELEASE - -
- -

It's wise to publish a finished release after finishing it. Do it similar to feature publishing with the - command:

-
- - git flow release publish RELEASE - -
-
-
-
-

(You can track a remote release with the git flow release track RELEASE command)

-
-
- -
-

Hotfixes

- - - -
-

git flow hotfix start

- -

Like the other git flow commands, a hotfix is started with

-
- - git flow hotfix start RELEASE - -
-

The release argument hereby marks the faulty production release

-
-
-
-
-
- -
-
-

Finish a hotfix

- -

TODO

-
-
-
-
-
- - -
-

Backlog

- -
- - -
-

Comments

- -
-
- - - -comments powered by Disqus - \ No newline at end of file