On Tue, Feb 3, 2009 at 11:07 AM, Markus Heidelberg <[email protected]> wrote: > > 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.
It's flexible. You can specify default parameters to be passed by setting the VCSCommandGitDiffOpt variable, and you can override those options at any point by putting them on the command line. That is, you can do things like: :VCSDiff ... to use the default options, and compare against the index. :VCSDiff --cached HEAD~ ... to compare the index against the HEAD's parent. Thank you, bob --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_use" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
