Fixing git: Attempt #2