(maint) Details about Git version / .gitconfig conflicts