Move old git inherits to git-r3; cleanup

Only minimal testing.