Change git editor from vim to emacs and add missing change from previous commit