Use vim-fugitive for vim+git integration
Merge branch 'vi'