1.0-stable: merge support for `make diff vc=git`
Authored by: cboos 2012-10-29
Parent: [r11433]
Child: [r11435]