@ctietze Does git prefer the EDITOR or VISUAL envvars over the on-disk setting? If so, you might be able to set up emacs (or the eshell it spawns) to expose one of those envvars set to an appropriate "emacs" value, so they override the on-disk setting that would otherwise apply ...