Some Git Tips

1. git add -u to add all modified files in the index.
2. git checkout -f to trash all uncommitted changes. Useful before pulling.
3. git stash as an alternative to above.
4. git diff --cached to see the added changes.
5. git rebase to squash multiple commits into a commit before pushing. Rebasing is useful for other stuff, but that needs more exploration.   git rebase -i origin/master to merge all unpushed commits.
6. git commit --amend might be an alternative for that as well. 
7. See here for some other tips.