Vincent Driessen | 6c2d30b | 2010-01-26 22:18:36 +0100 | [diff] [blame] | 1 | git-flow |
| 2 | ======== |
Vincent Driessen | 12c4ab4 | 2010-01-26 22:11:19 +0100 | [diff] [blame] | 3 | A collection of Git extensions to provide high-level repository operations |
Vincent Driessen | 4fc0bc1 | 2010-02-24 01:43:04 +0100 | [diff] [blame] | 4 | for Vincent Driessen's [branching model](http://nvie.com/git-model "original |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 5 | blog post"). |
| 6 | |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame] | 7 | |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 8 | > **IMPORTANT NOTE:** |
| 9 | > In release 0.2, the order of the arguments has changed to provide a logical |
| 10 | > subcommand hierarchy. |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame] | 11 | |
| 12 | |
Vincent Driessen | 12c4ab4 | 2010-01-26 22:11:19 +0100 | [diff] [blame] | 13 | Installing git-flow |
| 14 | ------------------- |
Vincent Driessen | 4f0f539 | 2010-07-10 17:05:27 +0200 | [diff] [blame] | 15 | The easiest way to install git-flow is using Rick Osborne's excellent |
| 16 | git-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 | |
| 20 | If you prefer a manual installation, please use the following instructions. |
Vincent Driessen | 13c9482 | 2010-02-15 20:09:02 +0100 | [diff] [blame] | 21 | After downloading the sources from Github, also fetch the submodules: |
| 22 | |
| 23 | $ git submodule init |
| 24 | $ git submodule update |
| 25 | |
| 26 | Then, you can install `git-flow`, using: |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame] | 27 | |
Vincent Driessen | 12c4ab4 | 2010-01-26 22:11:19 +0100 | [diff] [blame] | 28 | $ sudo make install |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame] | 29 | |
Vincent Driessen | e0b54c0 | 2010-03-19 19:27:38 +0100 | [diff] [blame] | 30 | By default, git-flow will be installed in /usr/local. To change the prefix |
| 31 | where git-flow will be installed, simply specify it explicitly, using: |
Vincent Driessen | 12c4ab4 | 2010-01-26 22:11:19 +0100 | [diff] [blame] | 32 | |
Vincent Driessen | e0b54c0 | 2010-03-19 19:27:38 +0100 | [diff] [blame] | 33 | $ sudo make prefix=/opt/local install |
Vincent Driessen | dd720be | 2010-01-27 00:00:09 +0100 | [diff] [blame] | 34 | |
| 35 | Or simply point your `PATH` environment variable to your git-flow checkout |
| 36 | directory. |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame] | 37 | |
| 38 | |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 39 | Please help out |
| 40 | --------------- |
Vincent Driessen | c49c793 | 2010-02-24 01:22:48 +0100 | [diff] [blame] | 41 | This project is still under development. Feedback and suggestions are very |
| 42 | welcome and I encourage you to use the [Issues |
| 43 | list](http://github.com/nvie/gitflow/issues) on Github to provide that |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame] | 44 | feedback. |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 45 | |
Vincent Driessen | d79a0d4 | 2010-04-04 16:11:44 +0200 | [diff] [blame] | 46 | Feel free to fork this repo and to commit your additions. For a list of all |
| 47 | contributors, please see the [AUTHORS](AUTHORS) file. |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 48 | |
Vincent Driessen | 1fd5bcf | 2010-07-15 23:21:21 -0700 | [diff] [blame] | 49 | Any questions, tips, or general discussion can be posted to our Google group: |
Vincent Driessen | 1911101 | 2010-07-15 23:21:55 -0700 | [diff] [blame] | 50 | http://groups.google.com/group/gitflow-users |
Vincent Driessen | 1fd5bcf | 2010-07-15 23:21:21 -0700 | [diff] [blame] | 51 | |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 52 | |
Vincent Driessen | 5d1dbe7 | 2010-04-04 15:52:55 +0200 | [diff] [blame] | 53 | License terms |
| 54 | ------------- |
| 55 | git-flow is published under the liberal terms of the BSD License, see the |
| 56 | [LICENSE](LICENSE) file. Although the BSD License does not require you to share |
| 57 | any modifications you make to the source code, you are very much encouraged and |
| 58 | invited to contribute back your modifications to the community, preferably |
| 59 | in a Github fork, of course. |
| 60 | |
| 61 | |
Vincent Driessen | c49c793 | 2010-02-24 01:22:48 +0100 | [diff] [blame] | 62 | Typical usage: |
| 63 | -------------- |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 64 | |
Vincent Driessen | c49c793 | 2010-02-24 01:22:48 +0100 | [diff] [blame] | 65 | ### Initialization |
| 66 | |
| 67 | To initialize a new repo with the basic branch structure, use: |
Vincent Driessen | 12c4ab4 | 2010-01-26 22:11:19 +0100 | [diff] [blame] | 68 | |
Vincent Driessen | c49c793 | 2010-02-24 01:22:48 +0100 | [diff] [blame] | 69 | git flow init |
Vincent Driessen | f9ebb07 | 2010-02-22 07:56:04 +0100 | [diff] [blame] | 70 | |
Vincent Driessen | c49c793 | 2010-02-24 01:22:48 +0100 | [diff] [blame] | 71 | This will then interactively prompt you with some questions on which branches |
| 72 | you would like to use as development and production branches, and how you |
| 73 | would like your prefixes be named. You may simply press Return on any of |
| 74 | those questions to accept the (sane) default suggestions. |
| 75 | |
| 76 | |
| 77 | ### Creating feature/release/hotfix/support branches |
Vincent Driessen | 12c4ab4 | 2010-01-26 22:11:19 +0100 | [diff] [blame] | 78 | |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 79 | * To list/start/finish feature branches, use: |
| 80 | |
| 81 | git flow feature |
| 82 | git flow feature start <name> [<base>] |
| 83 | git flow feature finish <name> |
| 84 | |
Vincent Driessen | 010252a | 2010-02-04 10:31:29 +0100 | [diff] [blame] | 85 | For feature branches, the `<base>` arg must be a commit on `develop`. |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 86 | |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 87 | * To list/start/finish release branches, use: |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 88 | |
Vincent Driessen | 04839ae | 2010-01-28 01:07:20 +0100 | [diff] [blame] | 89 | git flow release |
Vincent Driessen | 010252a | 2010-02-04 10:31:29 +0100 | [diff] [blame] | 90 | git flow release start <release> [<base>] |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 91 | git flow release finish <release> |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 92 | |
Vincent Driessen | 010252a | 2010-02-04 10:31:29 +0100 | [diff] [blame] | 93 | For release branches, the `<base>` arg must be a commit on `develop`. |
| 94 | |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 95 | * To list/start/finish hotfix branches, use: |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 96 | |
Vincent Driessen | 04839ae | 2010-01-28 01:07:20 +0100 | [diff] [blame] | 97 | git flow hotfix |
Vincent Driessen | 010252a | 2010-02-04 10:31:29 +0100 | [diff] [blame] | 98 | git flow hotfix start <release> [<base>] |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 99 | git flow hotfix finish <release> |
Vincent Driessen | 010252a | 2010-02-04 10:31:29 +0100 | [diff] [blame] | 100 | |
| 101 | For hotfix branches, the `<base>` arg must be a commit on `master`. |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 102 | |
| 103 | * To list/start support branches, use: |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 104 | |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 105 | git flow support |
Vincent Driessen | 010252a | 2010-02-04 10:31:29 +0100 | [diff] [blame] | 106 | git flow support start <release> <base> |
| 107 | |
| 108 | For support branches, the `<base>` arg must be a commit on `master`. |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 109 | |