Fix #976. Now prompt tries to use standard git command.
Fix bad error message for certain options.
https://github.com/fish-shell/fish-shell/issues/979
Merge remote-tracking branch 'upstream/master'