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 | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 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 | |
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 | ------------------- |
| 15 | To install `git-flow` as a real `git` subcommand, run: |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame] | 16 | |
Vincent Driessen | 12c4ab4 | 2010-01-26 22:11:19 +0100 | [diff] [blame] | 17 | $ sudo make install |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame] | 18 | |
Vincent Driessen | dd720be | 2010-01-27 00:00:09 +0100 | [diff] [blame] | 19 | By default, this will look for the directory where Git is already installed, |
| 20 | and install the git-flow extension alongside the other Git subcommands. If git |
| 21 | is not on the system's `PATH`, it tries `/usr/libexec/git-core`. To explicitly |
| 22 | override this setting in case you have installed Git in another location, use: |
Vincent Driessen | 12c4ab4 | 2010-01-26 22:11:19 +0100 | [diff] [blame] | 23 | |
Vincent Driessen | dd720be | 2010-01-27 00:00:09 +0100 | [diff] [blame] | 24 | $ sudo make GIT_EXEC_PATH=/your/custom/path install |
Vincent Driessen | 12c4ab4 | 2010-01-26 22:11:19 +0100 | [diff] [blame] | 25 | |
Vincent Driessen | dd720be | 2010-01-27 00:00:09 +0100 | [diff] [blame] | 26 | You rarely need to override this manually, the default 'make install' should do |
| 27 | fine. |
| 28 | |
| 29 | Or simply point your `PATH` environment variable to your git-flow checkout |
| 30 | directory. |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame] | 31 | |
| 32 | |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 33 | Please help out |
| 34 | --------------- |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame] | 35 | This project is still under development. What is available today is merely its |
| 36 | foundation. However, it is functional in its current form and should be usable |
| 37 | under normal use. (Don't try to create multiple release branches next to each |
| 38 | other and stuff like that, yet.) |
| 39 | |
| 40 | Feedback and suggestions are very welcome and I encourage you to use the |
| 41 | [Issues list](http://github.com/nvie/gitflow/issues) on Github to provide that |
| 42 | feedback. |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 43 | |
| 44 | Feel free to fork this repo and to commit your additions. |
| 45 | |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 46 | |
Vincent Driessen | f206ba6 | 2010-01-26 12:44:41 +0100 | [diff] [blame] | 47 | Example uses: |
| 48 | ------------- |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 49 | |
Vincent Driessen | 12c4ab4 | 2010-01-26 22:11:19 +0100 | [diff] [blame] | 50 | * To initialize a new repo with the basic branch structure, instead of using |
| 51 | `git init`, use: |
| 52 | |
| 53 | git flow init |
| 54 | |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 55 | * To list/start/finish feature branches, use: |
| 56 | |
| 57 | git flow feature |
| 58 | git flow feature start <name> [<base>] |
| 59 | git flow feature finish <name> |
| 60 | |
| 61 | (`base` is `develop` by default) |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 62 | |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 63 | * To list/start/finish release branches, use: |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 64 | |
Vincent Driessen | 04839ae | 2010-01-28 01:07:20 +0100 | [diff] [blame] | 65 | git flow release |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 66 | git flow release start <release> |
| 67 | git flow release finish <release> |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 68 | |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 69 | * To list/start/finish hotfix branches, use: |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 70 | |
Vincent Driessen | 04839ae | 2010-01-28 01:07:20 +0100 | [diff] [blame] | 71 | git flow hotfix |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 72 | git flow hotfix start <release> [<base-release>] |
| 73 | git flow hotfix finish <release> |
| 74 | |
| 75 | * To list/start support branches, use: |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 76 | |
Vincent Driessen | c81e7a2 | 2010-01-28 00:33:24 +0100 | [diff] [blame] | 77 | git flow support |
| 78 | git flow support start <release> [<base-release>] |
Vincent Driessen | 78c73dc | 2010-01-21 00:48:44 +0100 | [diff] [blame] | 79 | |