Add gbrt (git-branch-timeline).
Add git-conflicts alias, to show files that have unresolved conflicts.

This ignores whether you've said you've cleared the conflicts or not.
Add pre-commit hook to check for merge markers.
Matching ======= as a merge marker isn't reliable.

================= is sometimes used as a divider comment.
Remove hub. It conflicted with zsh autocompletion for git.