blob: 15766489b96defd7538d0bfcc08567b1b6ce392a [file] [log] [blame]
Vincent Driessen6c2d30b2010-01-26 22:18:36 +01001git-flow
2========
Vincent Driessen12c4ab42010-01-26 22:11:19 +01003A collection of Git extensions to provide high-level repository operations
Vincent Driessen4fc0bc12010-02-24 01:43:04 +01004for Vincent Driessen's [branching model](http://nvie.com/git-model "original
Vincent Driessen78c73dc2010-01-21 00:48:44 +01005blog post").
6
Vincent Driessenf206ba62010-01-26 12:44:41 +01007
Vincent Driessenc81e7a22010-01-28 00:33:24 +01008> **IMPORTANT NOTE:**
9> In release 0.2, the order of the arguments has changed to provide a logical
10> subcommand hierarchy.
Vincent Driessenf206ba62010-01-26 12:44:41 +010011
12
Vincent Driessen12c4ab42010-01-26 22:11:19 +010013Installing git-flow
14-------------------
Vincent Driessen4f0f5392010-07-10 17:05:27 +020015The easiest way to install git-flow is using Rick Osborne's excellent
16git-flow installer, which can be run using the following command:
17
18 $ wget -q -O - http://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | sudo sh
19
20If you prefer a manual installation, please use the following instructions.
Vincent Driessen13c94822010-02-15 20:09:02 +010021After downloading the sources from Github, also fetch the submodules:
22
23 $ git submodule init
24 $ git submodule update
25
26Then, you can install `git-flow`, using:
Vincent Driessenf206ba62010-01-26 12:44:41 +010027
Vincent Driessen12c4ab42010-01-26 22:11:19 +010028 $ sudo make install
Vincent Driessenf206ba62010-01-26 12:44:41 +010029
Vincent Driessene0b54c02010-03-19 19:27:38 +010030By default, git-flow will be installed in /usr/local. To change the prefix
31where git-flow will be installed, simply specify it explicitly, using:
Vincent Driessen12c4ab42010-01-26 22:11:19 +010032
Vincent Driessene0b54c02010-03-19 19:27:38 +010033 $ sudo make prefix=/opt/local install
Vincent Driessendd720be2010-01-27 00:00:09 +010034
35Or simply point your `PATH` environment variable to your git-flow checkout
36directory.
Vincent Driessenf206ba62010-01-26 12:44:41 +010037
38
Vincent Driessen78c73dc2010-01-21 00:48:44 +010039Please help out
40---------------
Vincent Driessenc49c7932010-02-24 01:22:48 +010041This project is still under development. Feedback and suggestions are very
42welcome and I encourage you to use the [Issues
43list](http://github.com/nvie/gitflow/issues) on Github to provide that
Vincent Driessenf206ba62010-01-26 12:44:41 +010044feedback.
Vincent Driessen78c73dc2010-01-21 00:48:44 +010045
Vincent Driessend79a0d42010-04-04 16:11:44 +020046Feel free to fork this repo and to commit your additions. For a list of all
47contributors, please see the [AUTHORS](AUTHORS) file.
Vincent Driessen78c73dc2010-01-21 00:48:44 +010048
Vincent Driessen78c73dc2010-01-21 00:48:44 +010049
Vincent Driessen5d1dbe72010-04-04 15:52:55 +020050License terms
51-------------
52git-flow is published under the liberal terms of the BSD License, see the
53[LICENSE](LICENSE) file. Although the BSD License does not require you to share
54any modifications you make to the source code, you are very much encouraged and
55invited to contribute back your modifications to the community, preferably
56in a Github fork, of course.
57
58
Vincent Driessenc49c7932010-02-24 01:22:48 +010059Typical usage:
60--------------
Vincent Driessen78c73dc2010-01-21 00:48:44 +010061
Vincent Driessenc49c7932010-02-24 01:22:48 +010062### Initialization
63
64To initialize a new repo with the basic branch structure, use:
Vincent Driessen12c4ab42010-01-26 22:11:19 +010065
Vincent Driessenc49c7932010-02-24 01:22:48 +010066 git flow init
Vincent Driessenf9ebb072010-02-22 07:56:04 +010067
Vincent Driessenc49c7932010-02-24 01:22:48 +010068This will then interactively prompt you with some questions on which branches
69you would like to use as development and production branches, and how you
70would like your prefixes be named. You may simply press Return on any of
71those questions to accept the (sane) default suggestions.
72
73
74### Creating feature/release/hotfix/support branches
Vincent Driessen12c4ab42010-01-26 22:11:19 +010075
Vincent Driessenc81e7a22010-01-28 00:33:24 +010076* To list/start/finish feature branches, use:
77
78 git flow feature
79 git flow feature start <name> [<base>]
80 git flow feature finish <name>
81
Vincent Driessen010252a2010-02-04 10:31:29 +010082 For feature branches, the `<base>` arg must be a commit on `develop`.
Vincent Driessen78c73dc2010-01-21 00:48:44 +010083
Vincent Driessenc81e7a22010-01-28 00:33:24 +010084* To list/start/finish release branches, use:
Vincent Driessen78c73dc2010-01-21 00:48:44 +010085
Vincent Driessen04839ae2010-01-28 01:07:20 +010086 git flow release
Vincent Driessen010252a2010-02-04 10:31:29 +010087 git flow release start <release> [<base>]
Vincent Driessenc81e7a22010-01-28 00:33:24 +010088 git flow release finish <release>
Vincent Driessen78c73dc2010-01-21 00:48:44 +010089
Vincent Driessen010252a2010-02-04 10:31:29 +010090 For release branches, the `<base>` arg must be a commit on `develop`.
91
Vincent Driessenc81e7a22010-01-28 00:33:24 +010092* To list/start/finish hotfix branches, use:
Vincent Driessen78c73dc2010-01-21 00:48:44 +010093
Vincent Driessen04839ae2010-01-28 01:07:20 +010094 git flow hotfix
Vincent Driessen010252a2010-02-04 10:31:29 +010095 git flow hotfix start <release> [<base>]
Vincent Driessenc81e7a22010-01-28 00:33:24 +010096 git flow hotfix finish <release>
Vincent Driessen010252a2010-02-04 10:31:29 +010097
98 For hotfix branches, the `<base>` arg must be a commit on `master`.
Vincent Driessenc81e7a22010-01-28 00:33:24 +010099
100* To list/start support branches, use:
Vincent Driessen78c73dc2010-01-21 00:48:44 +0100101
Vincent Driessenc81e7a22010-01-28 00:33:24 +0100102 git flow support
Vincent Driessen010252a2010-02-04 10:31:29 +0100103 git flow support start <release> <base>
104
105 For support branches, the `<base>` arg must be a commit on `master`.
Vincent Driessen78c73dc2010-01-21 00:48:44 +0100106