Useful git commands. Used a lot, forgotten just as much.

common-git-commands.rb

# reverse uncommitted changes
git clean -fd

# file names of changed files between master branch and your branch
git diff --name-status master..<yourbranch>

# push nonmaster branch to master branch. Optional -f flag to force it
git push [remote-name] [pushed-branch-name]:master

#rename current branch
git branch -m <newname>

#clear unstaged changes
git checkout -- .

#alias `checkout` to be `git co`
git config --global alias.co checkout

# ~/.bash_aliases
# other aliases
alias gst='git status'
alias gl='git pull'
alias gp='git push'
alias gd='git diff | mate'
alias gau='git add --update'
alias gc='git commit -v'
alias gca='git commit -v -a'
alias gb='git branch'
alias gba='git branch -a'
alias gco='git checkout'
alias gcob='git checkout -b'
alias gcot='git checkout -t'


# http://stackoverflow.com/questions/5807137/git-how-to-revert-uncommitted-changes-including-files-and-folders
# http://stackoverflow.com/questions/822811/showing-which-files-have-changed-between-git-branches
# http://stackoverflow.com/questions/14593538/make-heroku-run-non-master-git-branch