On 2016-08-02, at 4:25 AM, Konstantin Khomoutov 
<flatw...@users.sourceforge.net> wrote:

> On Tue, 26 Jul 2016 18:25:19 -0700
> Michael <keybou...@gmail.com> wrote:
>> When a merge makes a mess, git offers, from "git mergetool", vimdiff.
>> Is there an easy way to select one of the hunks at each point?
>> (generally, what I'm looking for is usually the right option,
>> corresponding to after the '====', and tagged as "REMOTE".)
> Sorry for the delayed response, but did you try to google that? ;-)
> Actually, in vimdiff mode, Vim supports two commands for selecting
> hunks -- :diffget and :diffput -- depending on what buffer you're in.
> BTW I'd recommend you to combine Vim and Git with a Vim plugin called
> vim-fugitive which makes some things simpler (in particular, I
> like :Ggrep).

Vim-fugitive? Who comes up with these names? I would not have thought that was 
for git.

I did try using vim's help, but I must not have tried the right keyword -- I 
never saw diffget or diffput, or anything about working with git.

Entertaining minecraft videos

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to