Vim Tips Wiki

Changes: Using Git from Vim


Back to page

(Add vim-fugitive)
(See also: Added links to other two Git tips)
Line 31: Line 31:
==See also==
==See also==
Additional [ tips] on Vim and Git by [ Amjith Ramanujam]
* [ Git Grep]
* [ Always start on first line of git commit message]
* Additional [ tips] on Vim and Git by [ Amjith Ramanujam]

Revision as of 04:27, January 4, 2010

Tip 1614 Printable Monobook Previous Next

created February 3, 2009 · complexity basic · author Alecclews · version 7.0

Git is a distributed version control system.

To use git from Vim, 3 packages are available:

  • git-vim (included with Vim 7.1 and later). Provides ftplugin and syntax files for editing various git files (e.g. commit messages).
  • fastgit.vim.
  • VCScommand plugin that needs to be installed separately. This provides commands to interact with git. Help text is provided.
  • vim-fugitive (status unknown). Help text is provided.

Git supports using vim diff to resolve merge conflicts

git mergetool -t vimdiff

To make it the default merge tool across all your repos

git config --global merge.tool vimdiff

See also


Around Wikia's network

Random Wiki