Git - There was a problem with the editor 'vi'

If you were messing around with your vim/vimrc, trying to install a new distro etc, there is a good chance you'll end up with this error when trying to edit your commit messages.

To fix this, you need to point git to vim or another editor:

git config --global core.editor /usr/bin/vim