quicker to reference a gist than search the innerwebs...

Git-Reference.md

Resolving merge conflicts

git checkout --ours index.html
git checkout --theirs _layouts/default.html

Remove files from repo after Adding to gitignore

git rm -r --cached .
git add .
git commit -m "Remove all files in .gitignore"

Clone specific branch

git clone -b <branch> <remote_repo>

# Example: 
git clone -b develop git@github.com:user/myproject.git

Push new brach to remote

git push -u origin <branch>

Delete remote branch

git push origin :old_branch

Rename remote branch (after renaming locally)

git push --set-upstream origin new_branch

To clear cache for local git branch tab completion (e.g. git checkout {hitTab})

git fetch --prune --all