Minor changes to git prompt.

Removed settings that no longer exist in __fish_git_prompt. Changed the
order of settings to match the order in which the documentation presents
them. Enabled "branch-style" descriptions for detached states.