Personal Git cheatsheet

git-cheatsheet

//////////////////////
//DEVELOPMENT
//////////////////////
//Checkout development branch and check
git checkout develop
git branch

//Code for a while
emacs....

//Commit changes
git commit -a -m "Life is wonderful"

//Push changes
git push origin develop

//////////////////////
//STAGING
//////////////////////

//Merge changes
git checkout staging
git merge develop

//Everything is ok, commit to staging
git push origin staging

//Deploy to Heroku staging
git push staging-heroku staging:master

//////////////////////
//PRODUCTION
//////////////////////

//Merge changes
git checkout master
git merge staging
git push production-heroku master:master

//////////////////////
//OTROS
//////////////////////

//Work with branches locally
git checkout --track origin/develop

//Update local repo (non existing branch) with remote branch
git branch -f --track develop origin/develop