public

Create a local tracking branch of your heroku/phpfog deployment

  • Download Gist
Heroku tracking branch.txt
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34
Create remote called heroku
> git remote add heroku git@heroku.com:YOURAPPNAME.git
 
create a local tracking branch called heroku
> git checkout -b heroku -t heroku/master
 
This will checkout the last revision you deployed to Heroku.
 
Now tell git to push the heroku branch to heroku/master
 
> git config remote.heroku.push heroku:master
 
You can then make changes on this branch independently of your master
and when you're ready to deploy to heroku just do this on your local
heroku branch
 
> git commit -m "Some minor bug fixing"
> git push heroku
... Will deploy ...
 
You can work on features on master:
 
> git checkout master
> # hack away
> git commit -a -m "My awesome new feature"
 
To deploy to Heroku
 
> git checkout heroku
> git merge master
> git push heroku
 
You can use the same technique to have multiple heroku apps for the one codebase,
e.g. a staging and production version.

Please sign in to comment on this gist.

Something went wrong with that request. Please try again.