alecthegeek (Alec Clews), 03.02.2009: > > On Feb 3, 12:30 pm, "alecthegeek (Alec Clews)" <[email protected]> > wrote: > > I'm a little confused on the recommended approach for using git > > version control under vim. > > I've written a small vim tip to summarise what I think is currently > the situation with git and vim. > > http://vim.wikia.com/wiki/Using_Git_from_Vim > > > Does anyone have any improvements or alternatives?
I personally prefer using git directly on the command line instead of wrapper Vim commands. So for viewing two versions of a file with vimdiff I occasionally use git-difftool, which is included in git's source tree under contrib/difftool/. It has the advantage, that you can pass any git-diff option to it. I don't know how flexible the corresponding VCScommand command is. There is also git-mergetool, which is also shipped with git releases. It can be used to solve merge conflicts and starts Vim with 3 buffers in diff mode. Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_use" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
