add git_prompt_status2

More detailed git status command, with prefixes for changes in staging
and working areas, and unmerged changes.

I guess this could replace git_prompt_status, but is does use the variables in a slightly different way and use a few more.

See also pull #2054