Fork of prezto with my custom configuration (stored on the custom branch).

Update master from upstream (original repo)

git checkout master
git pull upstream master
git push

Rebase custom branch onto tip of master (resolve any conflicts during rebase)

git checkout custom
git rebase master
git push