git workflow rfc

gitworkflow.sh

### Features ###

# Create new feature branch
$ git feature new admin_html_pruning

 # this executes the following for you
 $ git checkout -b feature_admin_html_pruning

 # create a new remote branch
 git push -u origin feature_admin_html_pruning:feature_admin_html_pruning
 
# Create new pull request for current branch, opens pull request web page for branch
$ git pullrequest new
 
# After pull request has been approved and merged by someone
$ git feature finish admin_html_pruning
 # check all commits from this branch are in master
 # if not display a warning are you sure you want to delete feature with unmerged changes 
 TODO
 # remove remote branch
 git push origin :feature_admin_html_pruning
 # delete local branch
 git branch -d feature_admin_html_pruning

# re-use feature functionality for hotfixes ie:
$ git hotfix new
$ git pullrequest new (open pull request page for hotfix)
$ git hotfix finish # delete branches

### Releases ###
# create a new release
$ git release new
 git remote update
 - check master is in sync with origin/master
 git tag # get last tag
 - increment tag version
 # create tag
 git tag -a v1.4 -m 'release 1.4'
 # push tag
 git push origin v1.4
 # release to heroku
 git push heroku master:master