(Added link to some more information) |
mNo edit summary |
||
Line 24: | Line 24: | ||
git config --global merge.tool vimdiff |
git config --global merge.tool vimdiff |
||
+ | |||
+ | ==See Also== |
||
Additional [http://www.osnews.com/story/21556/Using_Git_with_Vim tips] on Vim and Git by [http://amjith.blogspot.com/ Amjith Ramanujam] |
Additional [http://www.osnews.com/story/21556/Using_Git_with_Vim tips] on Vim and Git by [http://amjith.blogspot.com/ Amjith Ramanujam] |
||
+ | |||
==Comments== |
==Comments== |
||
[[Category:VersionControl]] |
[[Category:VersionControl]] |
Revision as of 13:06, 14 June 2009
Proposed tip Please edit this page to improve it, or add your comments below (do not use the discussion page).
created February 3, 2009 · complexity basic · author Alecclews · version 7.0
Git is a distributed version control system.
To use git from Vim, two 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).
- VCScommand plugin that needs to be installed separately. This provides commands to interact with git. 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
Additional tips on Vim and Git by Amjith Ramanujam