Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 1 | gitflow |
| 2 | ======= |
| 3 | A collection of Git wrapper scripts to provide high-level repository operations |
| 4 | for Vincent Driessen's [branching model](http://nvie.com/archives/323 "original |
| 5 | blog post"). |
| 6 | |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame^] | 7 | |
| 8 | Release 0.1 |
| 9 | ----------- |
| 10 | A quick release of version 0.1 has arrived. The main script are functional and |
| 11 | should be usable under "normal" use. |
| 12 | |
| 13 | There have barely been any real-world tests, but I encourage you to start using |
| 14 | it actively. [Feedback](http://github.com/nvie/gitflow/issues) is also very |
| 15 | welcome. 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 | |
| 21 | Installing gitflow |
| 22 | ------------------ |
| 23 | There isn't a real Unix installer available, but the project is so small that |
| 24 | installing it is easy. |
| 25 | |
| 26 | Either: |
| 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 Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 36 | Please help out |
| 37 | --------------- |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame^] | 38 | This project is still under development. What is available today is merely its |
| 39 | foundation. However, it is functional in its current form and should be usable |
| 40 | under normal use. (Don't try to create multiple release branches next to each |
| 41 | other and stuff like that, yet.) |
| 42 | |
| 43 | Feedback 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 |
| 45 | feedback. |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 46 | |
| 47 | Feel free to fork this repo and to commit your additions. |
| 48 | |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 49 | |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame^] | 50 | Example uses: |
| 51 | ------------- |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 52 | |
| 53 | * To start a new feature branch, use: |
| 54 | |
Vincent Driessen | e8766e0 | 2010-01-21 00:52:26 +0100 | [diff] [blame] | 55 | gitflow start feature <name> [<base>] |
| 56 | gitflow start feature foo-support |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 57 | |
| 58 | `base` is `develop` by default. |
| 59 | |
| 60 | * To finish this feature and have it merged into `develop`, use: |
| 61 | |
Vincent Driessen | 60e07ef | 2010-01-21 00:54:06 +0100 | [diff] [blame] | 62 | gitflow finish feature <name> |
| 63 | gitflow finish feature foo-support |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 64 | |
| 65 | * To start a new release branch for 2.0, based on the 1.1 production release, use: |
| 66 | |
Vincent Driessen | 60e07ef | 2010-01-21 00:54:06 +0100 | [diff] [blame] | 67 | gitflow start release <release> |
| 68 | gitflow start release 2.0 |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 69 | |
| 70 | * To finish the release branch (i.e. to make an actual production release), use: |
| 71 | |
Vincent Driessen | 60e07ef | 2010-01-21 00:54:06 +0100 | [diff] [blame] | 72 | gitflow finish release <release> |
| 73 | gitflow finish release 2.0 |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 74 | |
| 75 | * To start a new hotfix branch for 2.1, based on the 2.0 production release, use: |
| 76 | |
Vincent Driessen | 60e07ef | 2010-01-21 00:54:06 +0100 | [diff] [blame] | 77 | gitflow start hotfix <release> [<base-release>] |
| 78 | gitflow start hotfix 2.1 2.0 |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 79 | |
| 80 | * To finish the hotfix branch, use: |
| 81 | |
Vincent Driessen | 60e07ef | 2010-01-21 00:54:06 +0100 | [diff] [blame] | 82 | gitflow finish hotfix <release> |
| 83 | gitflow finish hotfix 2.1 |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 84 | |