hotfix workflow

hotfix.sh

# My Heroku git production remote is called 'production'
git remote -v

# Yields:
#
# origin	[email protected]:Loft47/loft.git (fetch)
# origin	[email protected]:Loft47/loft.git (push)
# production	https://git.heroku.com/loft47-prod.git (fetch)
# production	https://git.heroku.com/loft47-prod.git (push)
# staging	https://git.heroku.com/vey-staging.git (fetch)
# staging	https://git.heroku.com/vey-staging.git (push)

# First fetch the remote branches from production so that you're up-to-date
git fetch production

# Checkout a new branch based off the Heroku production master branch
git checkout -b bug/something -t production/master

# Do your work, then commit it
git add .
git commit -m 'My hotfix changes'

# Push directly to heroku
git push production bug/something:master

# Merge new commits into master
git checkout master
git merge bug/something