use `git -c g.o=v cmd' only when git supports it

Fixes #662.
Merge branch 'maint'
Merge branch 'master' into next