useful git commands.sh

#Create and checkout a new branch
git checkout -b [branchName]

#Checkout a remote branch
git checkout -b [localBranchName] origin/[remoteBranchName]

#Push local branch to remote
git push -u origin [branchName]

#Delete remote branch
git push origin --delete [branchName]
git push origin :[branchName]

#Prune local branches
git remote prune origin

#Various resets
git reset --soft HEAD^
git reset --hard HEAD
git reset --hard origin/master

#Push non-master branch to Heroku
git push heroku branchName:master
git push heroku +HEAD:master

#fix a local commit
$ git commit -m "Something terribly misguided"
$ git reset --soft HEAD~
<< edit files as necessary >>
$ git add [yourFiles]
$ git commit -C ORIG_HEAD

checking out a remote branch - if you want localBranchName to be the same as remoteBranchName you can just run git checkout remoteBranchName and it will create the local branch & set it to track the remote