Error message:

error: There was a problem with the editor 'vi'.
Please supply the message using either -m or -F option.

Quick solution:

git config --global core.editor $(which vim)

Short-reason: If you are using vundle, or similar, you could find this error.

Issue: https://github.com/VundleVim/Vundle.vim/issues/167