remove --no-ff by default
update oh-my-zsh