{"thread":{"id":"17247","subject":"[PATCH (resend) 2/2] difftool: put the cursor on the editable file for Vim","startedAt":"2009-01-19T05:34:29Z","lastAt":"2009-01-19T06:43:39Z","messageCount":2,"participants":["David Aguilar","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"101102","messageId":"1232343269-27665-1-git-send-email-davvid@gmail.com","threadId":"17247","inReplyTo":null,"subject":"[PATCH (resend) 2/2] difftool: put the cursor on the editable file for Vim","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2009-01-19T05:34:29Z","receivedAt":"2009-01-19T05:34:29Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"You only need to edit worktree files when comparing against\nthe worktree.  Put the cursor automatically into its window for\nvimdiff and gvimdiff to avoid doing <C-w>l every time.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\n contrib/difftool/git-difftool-helper |    8 ++++++--\n 1 files changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper\nindex 0b266e3..a6f862f 100755\n--- a/contrib/difftool/git-difftool-helper\n+++ b/contrib/difftool/git-difftool-helper\n@@ -78,12 +78,16 @@ launch_merge_tool () {\n \t\t\"$merge_tool_path\" -o \"$MERGED\" \"$LOCAL\" \"$REMOTE\"\n \t\t;;\n \n-\tmeld|vimdiff)\n+\tmeld)\n \t\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\"\n \t\t;;\n \n+\tvimdiff)\n+\t\t\"$merge_tool_path\" -c \"wincmd l\" \"$LOCAL\" \"$REMOTE\"\n+\t\t;;\n+\n \tgvimdiff)\n-\t\t\"$merge_tool_path\" -f \"$LOCAL\" \"$REMOTE\"\n+\t\t\"$merge_tool_path\" -c \"wincmd l\" -f \"$LOCAL\" \"$REMOTE\"\n \t\t;;\n \n \txxdiff)\n-- \n1.6.1.149.g7bbd8\n"},{"id":"101105","messageId":"7vzlhnre1w.fsf@gitster.siamese.dyndns.org","threadId":"17247","inReplyTo":"1232343269-27665-1-git-send-email-davvid@gmail.com","subject":"Re: [PATCH (resend) 2/2] difftool: put the cursor on the editable file for Vim","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-01-19T06:43:39Z","receivedAt":"2009-01-19T06:43:39Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ok, I see you updated from r to l.\n\nPlease do not mark such \"an earlier one had a thinko, and here is a\ncorrected patch\" as \"resend\".  It is confusing, because \"resend\" usually\nmeans \"I sent this earlier but somehow it did not reach the list, so here\nis another copy verbatim.\"\n\nInstead, please add a sentence or two after \"---\" lines to explain the\nsituation, like...\n\n    You only need to edit worktree files when comparing against\n    the worktree.  Put the cursor automatically into its window for\n    vimdiff and gvimdiff to avoid doing <C-w>r every time.\n\n    Signed-off-by: David Aguilar <davvid@gmail.com>\n    ---\n\n    Markus pointed out that 'l' is not left (it is right as in vi key\n    bindings).\n\n     contrib/difftool/git-difftool-helper |    8 ++++++--\n     1 files changed, 6 insertions(+), 2 deletions(-)\n\nand say \"[PATCH 2/2 (corrected)]\" so that I can easily tell which one was\na dud and which one I should take.\n\nThis time it wasn't confusing because the exchange between Markus and you\nwere the only unread messages before your three patches in my mailbox, but\nyou are not always that lucky.\n\nWill take your original 1/2 and this one.\n\nThanks.\n"}]}