Merge branch 'ed/simplify-setup-git-dir'