Re: Guided merge with override

From

SRSverre Rabbelier <alturin@gmail.com>

Date

Jun 17, 2008, 09:53 UTC

Message-ID

<bd6139dc0806170253r5ea7844dm71d0bc407da2acc7@mail.gmail.com>

In-Reply-To

<alpine.DEB.1.00.0806171045570.6439@racer>

> On Tue, 17 Jun 2008, Sverre Rabbelier wrote:
>> How about 'git ls-files -t | grep "^M " | xargs git checkout B --',
>
> You probably meant 'sed -n "s/^M //p"' instead of 'grep "^M"', right?

Whoops, yes, that would be a lot better :P.

> Of course, I think that a better way would be to ask "git diff
> --name-only --diff-filter=U".

-- 
Cheers,

Sverre Rabbelier