Changes: Using Git from Vim

Revision as of 00:51, 8 April 2009

Proposed tip Please edit this page to improve it, or add your comments below (do not use the discussion page).

Please use new tips to discuss whether this page should be a permanent tip, or whether it should be merged to an existing tip.

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 mergtool -t vimdiff

To make it the default merge tool

 git config --global merge.tool vimdiff

@@ Line 16: / Line 16: @@
 *git-vim (included with Vim 7.1 and later). Provides ftplugin and syntax files for editing various git files (e.g. commit messages).
 *{{script|id=90|text=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 mergtool -t vimdiff
+To make it the default merge tool
+  git config --global merge.tool vimdiff
 ==Comments==