On Tue, Jun 17, 2008 at 11:48 AM, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > 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". Hmmm, not having an unfinished merge at hand, would that require the sed on top too? -- Cheers, Sverre Rabbelier -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
