Re: [PATCH] contrib: add 'git difftool' for launching common merge tools

From: David Aguilar <davvid@gmail.com>
Date: Jan 19, 2009, 05:32 UTC
Message-ID: <402731c90901182132i28f62474kae7595f89e2abdae@mail.gmail.com>
In-Reply-To: <200901190603.06506.markus.heidelberg@web.de>

On Sun, Jan 18, 2009 at 9:03 PM, Markus Heidelberg

> Well, in "wincmd l" "l" doesn't mean "left", it doesn't mean "put the
> cursor into the left window", it just moves the cursor into the next
> right window. So "wincmd r" doesn't mean "put the cursor into the right
> window", but "rotate the window" (see :help ctrl-w_r).

oops.. i should know better. sorry... let's ignore 2/2 for now then. I'll resend. duh.. I should have known better.. h left, j down, k up, l right.

Show 27 quoted lines

>
> So with "wincmd r" the local file would be moved to the left side and
> the index file to the right side, still containing the cursor. Not what
> we want.
>
> With "wincmd l" the local file would stay on the right side, the index
> file on the left side, but the cursor would move from the left to the
> right side. Now we can edit the local file.
>
>> > You have deleted all the '-' chars from git-command, but when using it as the
>> > name I think it's the preferred method, only when used as command then without
>> > slash.
>>
>> I was wondering about that.  I think I tried to follow the lead from
>> the git-diff.txt documentation, but "diff" is a builtin and thus
>> doesn't have an actual git-diff, so I see why they should be
>> different.
>
> Hmm, I don't think it makes a difference, whether it's a builtin or not.
> git-diff only exists behind the scenes, invoking it as "git-diff"
> doesn't work anymore with default settings. On the other hand, I can
> also invoke "git difftool" without the slash, git can find it. The same
> way I can for example call "git svn", which also isn't a builtin.
>
> Markus
>
>

-- 
    David