Since we are creating a subshell, we can just do unsetopt locally inside it.
Since we are creating a subshell, we can just do unsetopt locally inside it.

Conflicts:
	prompt.sh

joeytwiddle/git-aware-prompt