undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

difftool: put the cursor on the editable file for Vim

Browse Source 
You only need to edit worktree files when comparing against
the worktree.  Put the cursor automatically into its window for
vimdiff and gvimdiff to avoid doing <C-w>l every time.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar 2009-01-18 21:34:29 -08:00 committed by Junio C Hamano
parent 507cfcbd81
commit 28da86a58d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/difftool/git-difftool-helper
View File

@ -78,12 +78,16 @@ launch_merge_tool () {
"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
;;
meld|vimdiff)
meld)
"$merge_tool_path" "$LOCAL" "$REMOTE"
;;
vimdiff)
"$merge_tool_path" -c "wincmd l" "$LOCAL" "$REMOTE"
;;
gvimdiff)
"$merge_tool_path" -f "$LOCAL" "$REMOTE"
"$merge_tool_path" -c "wincmd l" -f "$LOCAL" "$REMOTE"
;;
xxdiff)