.gitconfig pushdefault set back to simple
add the editorconfig plugin