Re: help with git usage
- From
- Richard Quirk <richard.quirk@gmail.com>
- Date
- Apr 30, 2008, 08:22 UTC
- Message-ID
- <cac9e4380804300122v4f23251cqbc36640a07379c8@mail.gmail.com>
- In-Reply-To
- <200804291738.m3THc2hC030601@rs40.luxsci.com>
On Tue, Apr 29, 2008 at 7:37 PM, Daniel Quinlan <danq@brtt.com> wrote:
Show 5 quoted lines
> 3) Similarly, I can't use the little context diffs I can see in git-gui -- > I need to see side by side comparisons; > I've become accustomed to tkdiff. It seems like git mergetool knows how to > do that in some restricted > circumstances, but I want to do it outside the context of a merge.
If you use Vim, I'd recommend the vcscommand plugin - see http://code.google.com/p/vcscommand/ - which has fairly recently added git support. Once installed :VCSVimDiff shows the diff side by side between working copy and HEAD (by default, or whatever revision you tell it) like a regular vimdiff between files.