[PATCH 2/2] difftool: put the cursor on the editable file for Vim
- From
David Aguilar <davvid@gmail.com>
- Date
- Jan 19, 2009, 05:27 UTC
- Message-ID
- <1232342840-27459-2-git-send-email-davvid@gmail.com>
- In-Reply-To
- <1232342840-27459-1-git-send-email-davvid@gmail.com>
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>r every time.
Signed-off-by: David Aguilar <davvid@gmail.com> --- contrib/difftool/git-difftool-helper | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper index 0b266e3..a6f862f 100755 --- a/contrib/difftool/git-difftool-helper +++ b/contrib/difftool/git-difftool-helper @@ -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 r" "$LOCAL" "$REMOTE" + ;; + gvimdiff) - "$merge_tool_path" -f "$LOCAL" "$REMOTE" + "$merge_tool_path" -c "wincmd r" -f "$LOCAL" "$REMOTE" ;; xxdiff)
-- 1.6.1.149.g7bbd8