Vim and git

You can happily work with git from command line, but if you install fugitive plugin you get boost of productivity, such as:
- 3 split diff (merge conflict)
- 2 split diff (changes)

- history view (Glog -- %)

- easy browse project tree on any revision (just hit enter on commit view)

- easy browse all commits that touch current file (Glog -- %)
- search by commit message, search in branch (Ggrep findme branchname)
- etc

see http://vimcasts.org/episodes/archive Fugitive.vim episode sceries for more details