Git 1.9 output

Basically, I backported the upstream version of detecting the status. This seemed less work and might even support the original PR to upstream.

Two new setting were introduced in the upstream version, both of which I included.