diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 5689dbd..f33cc77 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -14,6 +14,7 @@
 {{ end }}
 [core]
 	excludesfile = {{ joinPath .chezmoi.homeDir ".gitignore_global" }}
+  	editor = unset NVIM && $EDITOR
 [difftool "sourcetree"]
 	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
 	path =