Git: add alias to reset previous commit
Git: add --no-ff option as default for merge
Vim: update submodule