nvi - Work around problem with git