gitconfig: added alias undo-merge
Added lua-mode