* [PATCH] mergetool: put the cursor on the editable file for Vim
@ 2009-01-17 21:28 Markus Heidelberg
2009-01-18 1:35 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Markus Heidelberg @ 2009-01-17 21:28 UTC (permalink / raw
To: gitster; +Cc: git
When resolving conflicts, you only need to edit the $MERGED file. Put
the cursor automatically into its window for vimdiff and gvimdiff to
avoid doing <C-w>l every time.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
---
git-mergetool.sh | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index b2d5375..00e1337 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -200,14 +200,19 @@ merge_file () {
fi
status=$?
;;
- meld|vimdiff)
+ meld)
touch "$BACKUP"
"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
check_unchanged
;;
+ vimdiff)
+ touch "$BACKUP"
+ "$merge_tool_path" -c "wincmd l" "$LOCAL" "$MERGED" "$REMOTE"
+ check_unchanged
+ ;;
gvimdiff)
touch "$BACKUP"
- "$merge_tool_path" -f "$LOCAL" "$MERGED" "$REMOTE"
+ "$merge_tool_path" -c "wincmd l" -f "$LOCAL" "$MERGED" "$REMOTE"
check_unchanged
;;
xxdiff)
--
1.6.1.154.g97e2f
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] mergetool: put the cursor on the editable file for Vim
2009-01-17 21:28 [PATCH] mergetool: put the cursor on the editable file for Vim Markus Heidelberg
@ 2009-01-18 1:35 ` Junio C Hamano
2009-01-18 14:18 ` SZEDER Gábor
0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2009-01-18 1:35 UTC (permalink / raw
To: markus.heidelberg; +Cc: git
Markus Heidelberg <markus.heidelberg@web.de> writes:
> When resolving conflicts, you only need to edit the $MERGED file. Put
> the cursor automatically into its window for vimdiff and gvimdiff to
> avoid doing <C-w>l every time.
I think this is sensible.
I do not use vim, and I do not know if the patch does what it claims to
do, though.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mergetool: put the cursor on the editable file for Vim
2009-01-18 1:35 ` Junio C Hamano
@ 2009-01-18 14:18 ` SZEDER Gábor
2009-01-18 20:29 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: SZEDER Gábor @ 2009-01-18 14:18 UTC (permalink / raw
To: Junio C Hamano; +Cc: markus.heidelberg, git
On Sat, Jan 17, 2009 at 05:35:22PM -0800, Junio C Hamano wrote:
> Markus Heidelberg <markus.heidelberg@web.de> writes:
>
> > When resolving conflicts, you only need to edit the $MERGED file. Put
> > the cursor automatically into its window for vimdiff and gvimdiff to
> > avoid doing <C-w>l every time.
>
> I think this is sensible.
>
> I do not use vim, and I do not know if the patch does what it claims to
> do, though.
It does.
Tested-by: SZEDER Gábor <szeder@ira.uka.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mergetool: put the cursor on the editable file for Vim
2009-01-18 14:18 ` SZEDER Gábor
@ 2009-01-18 20:29 ` Junio C Hamano
0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2009-01-18 20:29 UTC (permalink / raw
To: SZEDER Gábor; +Cc: markus.heidelberg, git
SZEDER Gábor <szeder@ira.uka.de> writes:
> On Sat, Jan 17, 2009 at 05:35:22PM -0800, Junio C Hamano wrote:
>> Markus Heidelberg <markus.heidelberg@web.de> writes:
>>
>> > When resolving conflicts, you only need to edit the $MERGED file. Put
>> > the cursor automatically into its window for vimdiff and gvimdiff to
>> > avoid doing <C-w>l every time.
>>
>> I think this is sensible.
>>
>> I do not use vim, and I do not know if the patch does what it claims to
>> do, though.
>
> It does.
>
> Tested-by: SZEDER Gábor <szeder@ira.uka.de>
Thanks, both.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-01-18 20:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-17 21:28 [PATCH] mergetool: put the cursor on the editable file for Vim Markus Heidelberg
2009-01-18 1:35 ` Junio C Hamano
2009-01-18 14:18 ` SZEDER Gábor
2009-01-18 20:29 ` Junio C Hamano
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.