substantial changes to get git to work