Use vim as the git editor.
Use SourceTree's modifications to git config.