Skip to content

Commit

Permalink
update documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael O'Connell committed Aug 2, 2013
1 parent 62dd39d commit 6af8c8f
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 23 deletions.
4 changes: 4 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,7 @@ Authors are (ordered by first commit date):
- Myke Hines

Portions derived from other open source works are clearly marked.

Single Release Version

- Michael O'Connell
9 changes: 9 additions & 0 deletions Changes.mdown
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
single-release
-----
* Fixes a few bugs with 0.4.2

* Single release branch

* Remove support branch feature


0.4.2:
-----
Release date: **not yet**
Expand Down
31 changes: 8 additions & 23 deletions README.mdown
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
git-flow
git-flow-single-release
========

A collection of Git extensions to provide high-level repository operations
for Vincent Driessen's [branching model](http://nvie.com/git-model "original
blog post").

This version of the project makes two changes to the nvie model.

* First, instead of creating one release branch per version, one release branch is created and kept for the life of the project.
Tags on the release branch are used to indicate when a release stabilization phase starts and ends. The primary motivation for this
change is for automated deployment. I don't want to keep having to change which branch is deployed to testing environments.

* Second, the experimental 'support branch' feature is removed

Getting started
---------------
Expand Down Expand Up @@ -124,25 +131,3 @@ The ``-d`` flag will accept all defaults.
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](http://nvie.com/posts/a-successful-git-branching-model/) 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][2]][1]

[1]: http://flattr.com/thing/53771/git-flow
[2]: http://api.flattr.com/button/button-static-50x60.png

0 comments on commit 6af8c8f

Please sign in to comment.