Keeping the emacsclient as the git core.editor