From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 17 Jun 2008 09:48:38 GMT
Subject: Re: Guided merge with override
Message-ID: <alpine.DEB.1.00.0806171045570.6439@racer>
In-Reply-To: <bd6139dc0806170153h4fba934ei62cb06e98e0280fd@mail.gmail.com>

Hi,

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?

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

Ciao,
Dscho