Code

Merge branch 'jk/git-dir-lookup' into maint