Merge "Make local git dir creation optional"