Handy Git Commands

Here is a handy list of git command I use daily to make me more productive.

Clean your local workspace
git checkout .

git clean -f

Get a list of branches ordered by most recent commit
git for-each-ref --sort=committerdate refs/heads/

Get a list of conflict files (after the last rebase or merge)
git diff --name-only --diff-filter=U