git-smart
color.ui = true for git
Ignore zsh/cache.
Add .pryrc.
Add irbrc and update pryrc with similar things.
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.
Added a new provisioning script that can be run after every pull.
Merge branch 'new-provisioning-script'
Update README with new provisioning details.
Recursively clone the repository in provision.sh.
Properly ask for email and don't stash before provisioning.
Add SKIP_RBENV option and fix SSH key existence check.
Import git_prompt_info() verbatim from oh-my-zsh.
Prompt updates: display branch name and sha, and ruby version.
Update prompts.
Git autocorrect should wait 3 seconds (for safety).