#!/bin/zsh

set -ex

cd ~/.zprezto

git fetch upstream
git checkout master
git merge -m "Merge upstream/master" upstream/master
git submodule update --init --recursive

cd -