This fork contains the work done on https://github.com/bogdanmic/git-flow-feature-arc (this will be removed soon). Also this fork contains some fixes suggested by lonetwin regarding using ${DEVELOP_BRANCH} instead of a harcoded develop. You can find those fixes also on his fork. Thanks for the suggestion.
Basicaly I extended the git-flow-feature file to use "arc diff" and "arc amend" to open and close review requests. All the credits for building git-flow belong to its original owner. Bellow I left untouched the originla documentation as inspiration and guide lines for the new user.
To use the integration with phabricator, clone this repository and install gitflow as usual.
NOTE: Use this fork at your own risk. It is very likely that it will not be maintained with any bugfixes ore modifications that appear in the future to the original version unless this fork gains some popularity.
Well first for it to work you need to have installed this https://github.com/facebook/arcanist installed. This is a component used by phabricator to do code review.
For more details on installing Phabricator please check their documentation http://www.phabricator.com/docs/phabricator/article/Installation_Guide.html
After you do that, this fork allows you to:
-
create a code review request to the phabricator server
git flow feature review # it executes "arc diff develop" -
close the review requests after they are accepted
git flow feature finish # it executes "arc amend" at the beginning of the normal process
The new flow for a feature looks something like this:
git flow feature
git flow feature start <name> [<base>]
git flow feature review [update]
git flow feature finish <name>
I hope this is clear enough. If not, ask and maybe I will listen. I usally do :)
It works on mac and other linux based systems. Don't know about widows though. I hope this helps you as it did for me. Again, all credits go to the developers of git-flow because they build a neat little tool.
A collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model.
For the best introduction to get started with git flow, please read Jeff
Kreeftmeijer's blog post:
http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/
Or have a look at one of these screen casts:
- How to use a scalable Git branching model called git-flow (by Build a Module)
- A short introduction to git-flow (by Mark Derricutt)
- On the path with git-flow (by Dave Bock)
See the Wiki for up-to-date Installation Instructions.
For those who use the Bash or ZSH shell, please check out the excellent work on the git-flow-completion project by bobthecow. It offers tab-completion for all git-flow subcommands and branch names.
See the FAQ section of the project Wiki.
This project is still under development. Feedback and suggestions are very welcome and I encourage you to use the Issues list on Github to provide that feedback.
Feel free to fork this repo and to commit your additions. For a list of all contributors, please see the AUTHORS file.
Any questions, tips, or general discussion can be posted to our Google group: http://groups.google.com/group/gitflow-users
Fork the repository. Then, run:
git clone --recursive git@github.com:<username>/gitflow.git
cd gitflow
git branch master origin/master
git flow init -d
git flow feature start <your feature>
Then, do work and commit your changes. Hint: export PATH=`pwd`:$PATH
from within the gitflow directory makes sure you're using the version of
gitflow you're currently developing.
git flow feature publish <your feature>
When done, open a pull request to your feature branch.
git-flow is published under the liberal terms of the BSD License, see the LICENSE file. Although the BSD License does not require you to share any modifications you make to the source code, you are very much encouraged and invited to contribute back your modifications to the community, preferably in a Github fork, of course.
To initialize a new repo with the basic branch structure, use:
git flow init [-d]
This will then interactively prompt you with some questions on which branches you would like to use as development and production branches, and how you would like your prefixes be named. You may simply press Return on any of those questions to accept the (sane) default suggestions.
The -d flag will accept all defaults.
-
To list/start/finish feature branches, use:
git flow feature git flow feature start <name> [<base>] git flow feature finish <name>For feature branches, the
<base>arg must be a commit ondevelop. -
To push/pull a feature branch to the remote repository, use:
git flow feature publish <name> git flow feature pull <remote> <name> -
To list/start/finish release branches, use:
git flow release git flow release start <release> [<base>] git flow release finish <release>For release branches, the
<base>arg must be a commit ondevelop. -
To list/start/finish hotfix branches, use:
git flow hotfix git flow hotfix start <release> [<base>] git flow hotfix finish <release>For hotfix branches, the
<base>arg must be a commit onmaster. -
To list/start support branches, use:
git flow support git flow support start <release> <base>For support branches, the
<base>arg must be a commit onmaster.
A few people already requested it, so now it's here: a Flattr button.
Of course, the best way to show your appreciation for the original blog post or the git-flow tool itself remains contributing to the community. If you'd like to show your appreciation in another way, however, consider Flattr'ing me:
