blob: 86635b67d67159cc9c694995935913606dd74e12 [file] [log] [blame]
Vincent Driessen78c73dc2010-01-21 00:48:44 +01001gitflow
2=======
3A collection of Git wrapper scripts to provide high-level repository operations
4for Vincent Driessen's [branching model](http://nvie.com/archives/323 "original
5blog post").
6
Vincent Driessenf206ba62010-01-26 12:44:41 +01007
8Release 0.1
9-----------
10A quick release of version 0.1 has arrived. The main script are functional and
11should be usable under "normal" use.
12
13There have barely been any real-world tests, but I encourage you to start using
14it actively. [Feedback](http://github.com/nvie/gitflow/issues) is also very
15welcome. See the "Please help out" section below, also.
16
17**Make sure to validate the modifications to your repo after running any of the
18`gitflow` commands, before pushing them permanently.**
19
20
21Installing gitflow
22------------------
23There isn't a real Unix installer available, but the project is so small that
24installing it is easy.
25
26Either:
27
28- Put the `gitflow` directory anywhere on your Unix `PATH` variable; or
29- Run:
30
31 $ git clone git://github.com/nvie/gitflow
32 $ cd gitflow
33 $ cp gitflow* /usr/local/bin
34
35
Vincent Driessen78c73dc2010-01-21 00:48:44 +010036Please help out
37---------------
Vincent Driessenf206ba62010-01-26 12:44:41 +010038This project is still under development. What is available today is merely its
39foundation. However, it is functional in its current form and should be usable
40under normal use. (Don't try to create multiple release branches next to each
41other and stuff like that, yet.)
42
43Feedback and suggestions are very welcome and I encourage you to use the
44[Issues list](http://github.com/nvie/gitflow/issues) on Github to provide that
45feedback.
Vincent Driessen78c73dc2010-01-21 00:48:44 +010046
47Feel free to fork this repo and to commit your additions.
48
Vincent Driessen78c73dc2010-01-21 00:48:44 +010049
Vincent Driessenf206ba62010-01-26 12:44:41 +010050Example uses:
51-------------
Vincent Driessen78c73dc2010-01-21 00:48:44 +010052
53* To start a new feature branch, use:
54
Vincent Driessene8766e02010-01-21 00:52:26 +010055 gitflow start feature <name> [<base>]
56 gitflow start feature foo-support
Vincent Driessen78c73dc2010-01-21 00:48:44 +010057
58 `base` is `develop` by default.
59
60* To finish this feature and have it merged into `develop`, use:
61
Vincent Driessen60e07ef2010-01-21 00:54:06 +010062 gitflow finish feature <name>
63 gitflow finish feature foo-support
Vincent Driessen78c73dc2010-01-21 00:48:44 +010064
65* To start a new release branch for 2.0, based on the 1.1 production release, use:
66
Vincent Driessen60e07ef2010-01-21 00:54:06 +010067 gitflow start release <release>
68 gitflow start release 2.0
Vincent Driessen78c73dc2010-01-21 00:48:44 +010069
70* To finish the release branch (i.e. to make an actual production release), use:
71
Vincent Driessen60e07ef2010-01-21 00:54:06 +010072 gitflow finish release <release>
73 gitflow finish release 2.0
Vincent Driessen78c73dc2010-01-21 00:48:44 +010074
75* To start a new hotfix branch for 2.1, based on the 2.0 production release, use:
76
Vincent Driessen60e07ef2010-01-21 00:54:06 +010077 gitflow start hotfix <release> [<base-release>]
78 gitflow start hotfix 2.1 2.0
Vincent Driessen78c73dc2010-01-21 00:48:44 +010079
80* To finish the hotfix branch, use:
81
Vincent Driessen60e07ef2010-01-21 00:54:06 +010082 gitflow finish hotfix <release>
83 gitflow finish hotfix 2.1
Vincent Driessen78c73dc2010-01-21 00:48:44 +010084